From b3105f29783db61c169998bac34e9c3cee466dfa Mon Sep 17 00:00:00 2001
From: Harrison <harrison(at)theshoebridges(dot)com>
Date: Sat, 10 Jan 2015 10:57:59 +1100
Subject: [PATCH] Removed merge conflict text

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

diff --git a/README.md b/README.md
index d201922..bc5436c 100644
--- a/README.md
+++ b/README.md
@@ -8,11 +8,8 @@ Feddie
 
 Harrison Shoebridge (@paked)
 Jack Reichelt (jackreichelt)
-<<<<<<< HEAD
 Benjamin Jelavic
-=======
 David (@auscompgeek)
->>>>>>> origin/master
 Rob Pike