From 63d04ce9d2311fe7eef7d2ebd1febf332d1b6156 Mon Sep 17 00:00:00 2001
From: "h.ehrenfried" <2012537@stud.hs-mannheim.de>
Date: Sat, 8 Oct 2022 17:46:22 +0200
Subject: [PATCH] conflict

---
 Untitled 2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Untitled 2 b/Untitled 2
index e855f70..aeda6e7 100644
--- a/Untitled 2	
+++ b/Untitled 2	
@@ -1,2 +1,2 @@
 Hinrik
-Julian
\ No newline at end of file
+Tom
\ No newline at end of file