From 91e9eaea0653558b8865065df179002b666b0979 Mon Sep 17 00:00:00 2001
From: Philip Mundt <philip.mundt@uni-bielefeld.de>
Date: Thu, 11 Jul 2024 16:45:59 +0200
Subject: [PATCH] 3

---
 README.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/README.md b/README.md
index fc82948b..b40a72e2 100644
--- a/README.md
+++ b/README.md
@@ -90,8 +90,5 @@ Argument of type 'DSVRowArray<string>' is not assignable to parameter of type 'S
         Type 'DSVRowString<string>' is not assignable to type 'undefined'.
 
         Hallo ich bins
-<<<<<<< HEAD
         Hallo ich bins nochmal
-=======
-        Overwritten 
->>>>>>> b9874de4a3a95cf7147f63219b4c6178e2a963c3
+        Overwritten 
\ No newline at end of file
-- 
GitLab