From 13dc0a25bef22f7dbe828eb88a8af95ea3ddc151 Mon Sep 17 00:00:00 2001
From: Ryan Wild <ryan-a-wild@protonmail.com>
Date: Sun, 13 Aug 2017 13:18:01 +0100
Subject: [PATCH] Resolved issue whereby the editor didnt save when it should
 have

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

diff --git a/README.md b/README.md
index 79e6b3b8..42a9f088 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,7 @@
 # TotalFreedomMod #
 
-<<<<<<< HEAD
+
 [![Build Status](https://travis-ci.org/TotalFreedom/TotalFreedomMod.svg?branch=TFM1.12-Alpha)](https://travis-ci.org/TotalFreedom/TotalFreedomMod)
-=======
-[![Build Status](https://travis-ci.org/TotalFreedom/TotalFreedomMod.svg?branch=devel)](https://travis-ci.org/TotalFreedom/TotalFreedomMod)
->>>>>>> devel
 
 TotalFreedomMod is a CraftBukkit server plugin designed primarily to support the [Official TotalFreedom Minecraft Server](http://totalfreedom.me/). However, you are more than welcome to adapt the source for your own server.