Update .gitignore

Author: chentao0707

.gitignore

@@ -33,55 +33,13 @@ local.properties
 proguard.cfg
 proguard-project.txt
 
-<<<<<<< HEAD
 # Other
 .DS_Store
 dist
 tmp
-=======
+
 # Proguard folder generated by Eclipse
 proguard/
 
 # Log Files
 *.log
-
-# Android generated
-bin
-gen
-lint.xml
-
-# IntelliJ IDEA
-.idea
-*.iml
-*.ipr
-*.iws
-classes
-gen-external-apklibs
-
-# Eclipse
-.project
-.classpath
-.settings
-.checkstyle
-
-# Gradle
-.gradle
-build
-out
-
-# Maven
-target
-release.properties
-pom.xml.*
-
-# Ant
-ant.properties
-local.properties
-proguard.cfg
-proguard-project.txt
-
-# Other
-.DS_Store
-dist
-tmp
->>>>>>> master