.gitignore

<<<<<<< HEAD
*.iml
.gradle
/local.properties
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
.DS_Store
/captures
.externalNativeBuild
# Generated files
bin/
gen/
out/

# Gradle files
build/

# Proguard folder generated by Eclipse
proguard/

# Log Files
*.log

# Android Studio Navigation editor temp files
.navigation/

# Android Studio captures folder
captures/

# Intellij
.idea/tasks.xml
.idea/gradle.xml
.idea/dictionaries

# Keystore files
*.jks

# External native build folder generated in Android Studio 2.2 and later

# Google Services (e.g. APIs or Firebase)
google-services.json

# Freeline
freeline.py
freeline/
freeline_project_description.json
>>>>>>> d0ac1a471393520dcbcf31098b4c538f6694fdca
Supprimerait .gitignore
Supprimerait .idea/caches/
Supprimerait .idea/codeStyles/
Supprimerait .idea/dbnavigator.xml
Supprimerait .idea/gradle.xml
Supprimerait .idea/misc.xml
Supprimerait .idea/runConfigurations.xml
Supprimerait app/.gitignore
Supprimerait app/build.gradle
Supprimerait app/libs/
Supprimerait app/proguard-rules.pro
Supprimerait app/src/
Supprimerait build.gradle
Supprimerait gradle.properties
Supprimerait gradle/
Supprimerait gradlew
Supprimerait gradlew.bat
Supprimerait settings.gradle