@ -1,6 +1,6 @@
<<<<<<< HEAD
*.DS_Store
=======
# General
.DS_Store
.AppleDouble
@ -90,7 +90,7 @@ local.properties
# Typically, this file would be tracked if it contains build/dependency configurations:
#.project
>>>>>>> 28280ec94efca9a2a06808ca8279c3bace4835de
*.metadata/
*.class
/GameProject/doc/