Fixes gitignore merge conflict.

googlearchive / tango-examples-c

JNI example projects for Project Tango [deprecated] C-API

https://developers.google.com/ar

Apache License 2.0

337 stars 204 forks source link

Closed connerbrooks closed 9 years ago

connerbrooks commented 9 years ago

Simplifies gitignore, and removes conflicts.

jguomoto commented 9 years ago

@connerbrooks could you finish the contribution CLA