From 144998385a9c2e9fb400c542255322149397f724 Mon Sep 17 00:00:00 2001
From: CodeCrafter912 <dozedler@gmail.com>
Date: Fri, 29 Jun 2018 20:04:36 +0200
Subject: [PATCH] wer

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

diff --git a/README.md b/README.md
index db2e62a..f4eaf97 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,5 @@ Thgis is a test Repo for educational purposes
 test
 hallo<br>
 hallo2
-<<<<<<< HEAD
 auch hallo
-=======
 test
->>>>>>> origin/master