schrom01 4b658b9ed9 Merge branch 'creation_of_simple_classes' into FileIO ... # Conflicts: # app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java		2022-04-28 14:56:21 +02:00
..
src	Merge branch 'creation_of_simple_classes' into FileIO	2022-04-28 14:56:21 +02:00
build.gradle	created gradle application	2022-04-22 10:10:20 +02:00