From 4154911bc0660e659682b34b5b51729cba44669a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anne-C=C3=A9line=20Granjon?= <anne-celine.granjon@idiv.de> Date: Thu, 16 May 2024 17:21:40 +0200 Subject: [PATCH] will ein conflict --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2347387..aed9dd2 100644 --- a/README.md +++ b/README.md @@ -7,4 +7,6 @@ Now I'm adding a new section, let's call it Methods. This section is now finishe I'm adding another section, let's call it Results. I started this section before I committed the version with the Methods. -Here is the content of the side branch named Playground \ No newline at end of file +Here is the content of the side branch named Playground + +I absolutely want to create a conflict \ No newline at end of file -- GitLab