From 01daf5891b56737e075dfc45f400b3ccbfb6a58d Mon Sep 17 00:00:00 2001 From: bartsimo <bartke.simon@gmail.com> Date: Thu, 9 Jun 2022 14:37:10 +0200 Subject: [PATCH] Cleaned up --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index cbd838e..6ee715f 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,12 @@ Demo GitLab-Projekt. Hier MIT README.md Commitet und pusht LINUX. -<<<<<<< HEAD + Jetzt Fehler produzieren, ohne vorher zu pullen. -======= + Test how it is supposed to be. ->>>>>>> e8b64a15f674523693af451c5bda555a2db34849 + +MERGE RESOLVED ## Getting started -- GitLab