kleineckeol72024 061646a7d6 Merge remote-tracking branch 'origin/master' ... # Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/com/example/ueberwachungssystem/MainActivity.java # app/src/main/res/layout/activity_main.xml		2023-06-20 23:05:14 +02:00
..
gradle-wrapper.jar	added new Project ueberwachungssystem	2023-05-11 15:25:28 +02:00
gradle-wrapper.properties	Merge remote-tracking branch 'origin/master'	2023-06-20 23:05:14 +02:00