56de1441d9
# Conflicts: # .gitignore |
||
---|---|---|
.gradle | ||
.idea | ||
app | ||
gradle/wrapper | ||
.gitignore | ||
README.md | ||
gradlew | ||
gradlew.bat | ||
settings.gradle |
56de1441d9
# Conflicts: # .gitignore |
||
---|---|---|
.gradle | ||
.idea | ||
app | ||
gradle/wrapper | ||
.gitignore | ||
README.md | ||
gradlew | ||
gradlew.bat | ||
settings.gradle |