2017.11.29

wangshangyao · Nov 29, 2017 · f5cd155 · f5cd155
2 parents 3ab1f8a + 0685d70
commit f5cd155
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 *.iml
 .gradle
 /local.properties
@@ -7,3 +8,7 @@
 /build
 /captures
 .externalNativeBuild
+=======
+# Google App Engine generated folder
+appengine-generated/
+>>>>>>> 0685d70f0f0da0e6acfbd8e54d0751e23fe3c61d