98f35c6555
# Conflicts: # app/src/main/java/com/example/oplogy/MainActivity.java |
||
---|---|---|
.idea | ||
app | ||
gradle/wrapper | ||
.gitignore | ||
build.gradle | ||
gradle.properties | ||
gradlew | ||
gradlew.bat | ||
settings.gradle |
98f35c6555
# Conflicts: # app/src/main/java/com/example/oplogy/MainActivity.java |
||
---|---|---|
.idea | ||
app | ||
gradle/wrapper | ||
.gitignore | ||
build.gradle | ||
gradle.properties | ||
gradlew | ||
gradlew.bat | ||
settings.gradle |