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