From a857fbe2621a4d31dca2e6ee31e1675102ad2a8d Mon Sep 17 00:00:00 2001
From: Spanner_Man <spannerman79@users.noreply.github.com>
Date: Sun, 6 Dec 2015 16:08:37 +1100
Subject: [PATCH] Derp

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

diff --git a/README.md b/README.md
index 2309b81..b1d21f8 100644
--- a/README.md
+++ b/README.md
@@ -12,10 +12,8 @@ This repo was based on KCauldron 1492 Build 152.  Some extra patches were added
 
 ## Downloads
 You can download the pre-built packages from https://github.com/spannerman79/KCauldron/releases
-<<<<<<< HEAD
 I'd suggest that you look at the release notes before downloading.
-=======
->>>>>>> origin/master
+
 
 ## Build Requirements
 * Java 8 JDK