.gitignore

# Built application files
<<<<<<< HEAD
/*/build/
build
 
# Crashlytics configuations
com_crashlytics_export_strings.xml
 
# Local configuration file (sdk path, etc)
local.properties
 
# Gradle generated files
.gradle/
 
# Signing files
.signing/
 
# User-specific configurations
.idea
*.iml
 
# OS-specific files
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
ehthumbs.db
Thumbs.db
=======
*.apk
*.ap_

# Files for the ART/Dalvik VM
*.dex

# Java class files
*.class

# Generated files
bin/
gen/
out/

# Gradle files
.gradle/
build/

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

# Proguard folder generated by Eclipse
proguard/

# Log Files
*.log

# Android Studio Navigation editor temp files
.navigation/

# Android Studio captures folder
captures/

# Intellij
*.iml
.idea/workspace.xml

# Keystore files
*.jks
>>>>>>> 2825a231044d7a3f3b41dacfd435a8a047966001