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

---
 Untitled 1 | 2 +-
 Untitled 2 | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Untitled 1 b/Untitled 1
index 409fdf5..53f5007 100644
--- a/Untitled 1	
+++ b/Untitled 1	
@@ -1 +1 @@
-Hallo h
\ No newline at end of file
+Hallo
\ No newline at end of file
diff --git a/Untitled 2 b/Untitled 2
index 804eef3..e855f70 100644
--- a/Untitled 2	
+++ b/Untitled 2	
@@ -1 +1,2 @@
-Hinrik
\ No newline at end of file
+Hinrik
+Julian
\ No newline at end of file