Merge remote-tracking branch 'origin/Hinrik_Test' into main

Conflicts: Untitled 2
2022-10-08 20:59:58 +02:00 · 2022-10-08 20:59:58 +02:00 · 17b85a7881
parent f4f361fc69 3fb5d6fb50
commit 17b85a7881
1 changed files with 5 additions and 1 deletions
--- a/6
+++ b/6
@ -1,2 +1,6 @@
 Hinrik
-Hinrik
+<<<<<<< HEAD
+Hinrik
+=======
+Tom  Julian Aytacs
+>>>>>>> refs/remotes/origin/Hinrik_Test