From 1c4b177219dd509c3b89f7b2202e6e2a100d47c7 Mon Sep 17 00:00:00 2001
From: CodeCrafter912 <dozedler@gmail.com>
Date: Fri, 29 Jun 2018 20:12:27 +0200
Subject: [PATCH] merged

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

diff --git a/README.md b/README.md
index ecf7683..5f7523a 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,5 @@ hallo2
 auch hallo
 test
 zuppa
-<<<<<<< HEAD
 nochmal zuppa
-=======
->>>>>>> 1223f4ad4a01f1766b1836cf6a248fb102154372
+tohl