From 28539cb9804a2bda8a7d94ec078b1b60ac3ded06 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Mon, 22 Feb 2016 08:47:51 -0500
Subject: bug fixes

---
 xml/playerSpawnHill1.xml | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'xml')

diff --git a/xml/playerSpawnHill1.xml b/xml/playerSpawnHill1.xml
index c5e736b..0c0fe4c 100644
--- a/xml/playerSpawnHill1.xml
+++ b/xml/playerSpawnHill1.xml
@@ -29,14 +29,9 @@ And it wasn't stormy.
 		You should go talk to my friend Johnny. He's a pretty chill dude.
 	</text>
 	
-<<<<<<< HEAD
-	<text id="2" call="Johnny" callid="1">
-		what you have done it to trick Microsoft?
-=======
 	<text id="2" >
 		Niice.
 		<quest check="Your First Quest" fail="3" />
->>>>>>> 3033594b89f23e65b6152daa6610f991307f2f67
 	</text>
 	
 	<text id="3">
-- 
cgit v1.2.3