merge

2022-10-08 21:00:35 +02:00 · 2022-10-08 21:00:35 +02:00 · b79a8ee5cb
parent 17b85a7881
commit b79a8ee5cb
2 changed files with 1 additions and 6 deletions
--- a/1
+++ b/1
@ -0,0 +1 @@
+Hinrik
--- a/6
+++ b/6
@ -1,6 +0,0 @@
-Hinrik
-<<<<<<< HEAD
-Hinrik
-=======
-Tom  Julian Aytacs
->>>>>>> refs/remotes/origin/Hinrik_Test