Merge branch 'main' of ssh://gitlab.igem.org/2024/bielefeld-cebitec

README.md

@@ -90,4 +90,8 @@ 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
-        Hallo ich bins nochmal
\ No newline at end of file
+<<<<<<< HEAD
+        Hallo ich bins nochmal
+=======
+        Overwritten 
+>>>>>>> b9874de4a3a95cf7147f63219b4c6178e2a963c3