# Conflicts: # app/src/main/java/com/android/grape/MainActivity.kt |
||
---|---|---|
.idea | ||
app | ||
gradle | ||
.gitignore | ||
build.gradle.kts | ||
gradle.properties | ||
gradlew | ||
gradlew.bat | ||
settings.gradle.kts |
# Conflicts: # app/src/main/java/com/android/grape/MainActivity.kt |
||
---|---|---|
.idea | ||
app | ||
gradle | ||
.gitignore | ||
build.gradle.kts | ||
gradle.properties | ||
gradlew | ||
gradlew.bat | ||
settings.gradle.kts |