From 8c4932f83778cd15ea252752129468f9f447d4e0 Mon Sep 17 00:00:00 2001
From: Thomas Karl Pietrowski <thopiekar@googlemail.com>
Date: Thu, 17 Nov 2016 23:09:51 +0100
Subject: [PATCH] Cleanup

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 376bdd8547..9357e436ff 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 Cura
 ====