diff --git a/README.md b/README.md index 758a7caa05b776a4f2f36523146c07d1330f7494..fc82948b6cc9ca339999e75075a7425f2cd98508 100644 --- a/README.md +++ b/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