From b79a8ee5cb3323b0ba8cccc913973904b55660c6 Mon Sep 17 00:00:00 2001
From: "h.ehrenfried" <2012537@stud.hs-mannheim.de>
Date: Sat, 8 Oct 2022 21:00:35 +0200
Subject: [PATCH] merge

---
 Tutoren    | 1 +
 Untitled 2 | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)
 create mode 100644 Tutoren
 delete mode 100644 Untitled 2

diff --git a/Tutoren b/Tutoren
new file mode 100644
index 0000000..804eef3
--- /dev/null
+++ b/Tutoren
@@ -0,0 +1 @@
+Hinrik
\ No newline at end of file
diff --git a/Untitled 2 b/Untitled 2
deleted file mode 100644
index 0b93106..0000000
--- a/Untitled 2	
+++ /dev/null
@@ -1,6 +0,0 @@
-Hinrik
-<<<<<<< HEAD
-Hinrik
-=======
-Tom  Julian Aytacs
->>>>>>> refs/remotes/origin/Hinrik_Test