cd0c9a4773
# Conflicts: # app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/App.java |
||
---|---|---|
.gradle | ||
.idea | ||
app | ||
gradle/wrapper | ||
.gitignore | ||
README.md | ||
gradlew | ||
gradlew.bat | ||
settings.gradle |
cd0c9a4773
# Conflicts: # app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/App.java |
||
---|---|---|
.gradle | ||
.idea | ||
app | ||
gradle/wrapper | ||
.gitignore | ||
README.md | ||
gradlew | ||
gradlew.bat | ||
settings.gradle |