# Conflicts: # .gradle/buildOutputCleanup/cache.properties # .idea/workspace.xml # app/src/main/java/verdnatura/es/repartoverdnatura/ExpeditionSummaryActivity.kt # app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java # app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java # app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtilsSalix.java # app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/Utils.java |
||
---|---|---|
.. | ||
debug | ||
release | ||
src | ||
.DS_Store | ||
.gitignore | ||
build.gradle | ||
google-services.json | ||
proguard-rules.pro |