<<<<<<< HEAD
<<<<<<< 4696aef8af6154651b0085276a8434a125575a4b
<<<<<<< HEAD
/XPGSdkV4AppBase/bin
=======
# Built application files
*.apk
*.ap_

# Files for the Dalvik VM
*.dex

# Java class files
*.class

# Generated files
bin/
gen/

# Gradle files
.gradle/
build/

# Local configuration file (sdk path, etc)
local.properties

# Proguard folder generated by Eclipse
proguard/

# Log Files
*.log
>>>>>>> github/master
=======
/bin/gen
/bin
/gen
>>>>>>> 63ac33f344535612135390d4711556d8f60d2ef2
=======
/bin/gen
/bin
/gen
>>>>>>> refs/heads/master