52 lines
708 B
Plaintext
52 lines
708 B
Plaintext
<<<<<<< HEAD
|
|
*.iml
|
|
.gradle
|
|
/local.properties
|
|
/.idea/caches
|
|
/.idea/libraries
|
|
/.idea/modules.xml
|
|
/.idea/workspace.xml
|
|
/.idea/navEditor.xml
|
|
/.idea/assetWizardSettings.xml
|
|
.DS_Store
|
|
/build
|
|
/captures
|
|
.externalNativeBuild
|
|
.cxx
|
|
local.properties
|
|
=======
|
|
# Gradle files
|
|
.gradle/
|
|
build/
|
|
|
|
# Local configuration file (sdk path, etc)
|
|
local.properties
|
|
|
|
# Log/OS Files
|
|
*.log
|
|
|
|
# Android Studio generated files and folders
|
|
captures/
|
|
.externalNativeBuild/
|
|
.cxx/
|
|
*.apk
|
|
output.json
|
|
|
|
# IntelliJ
|
|
*.iml
|
|
.idea/
|
|
misc.xml
|
|
deploymentTargetDropDown.xml
|
|
render.experimental.xml
|
|
|
|
# Keystore files
|
|
*.jks
|
|
*.keystore
|
|
|
|
# Google Services (e.g. APIs or Firebase)
|
|
google-services.json
|
|
|
|
# Android Profiling
|
|
*.hprof
|
|
>>>>>>> 968054a (Default code)
|