风月读书1.0

4 years ago · 232950e205
parent b3176fd4f1 830f1ce06a
commit 232950e205
1 changed files with 4 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -9,6 +9,7 @@
 /captures
 .externalNativeBuild
 =======
+>>>>>>> eee131cea39d27218fc7d1c3d641d617d377af42
 # Compiled class file
 *.class

@ -32,4 +33,7 @@

 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+<<<<<<< HEAD
 >>>>>>> 2c33f0b33a0411efd93a4810de5061a473835ff5
+=======
+>>>>>>> eee131cea39d27218fc7d1c3d641d617d377af42