From ca1574c0dd3baf85a95b804a73a5101f77ad8261 Mon Sep 17 00:00:00 2001
From: drumsetmonkey <abelleisle@roadrunner.com>
Date: Mon, 22 Feb 2016 16:39:09 -0500
Subject: Work

---
 main.cpp                 | 1 -
 src/world.cpp            | 2 +-
 xml/playerSpawnHill1.xml | 5 -----
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/main.cpp b/main.cpp
index 805fa00..cf277cb 100644
--- a/main.cpp
+++ b/main.cpp
@@ -628,7 +628,6 @@ void render(){
 	player->inv->draw();
 
 	/*
-<<<<<<< HEAD
 	 *	Here we draw a black overlay if it's been requested.
 	*/
 
diff --git a/src/world.cpp b/src/world.cpp
index 51efaf2..a2758fa 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -1589,4 +1589,4 @@ World *loadWorldFromXMLNoSave(const char *path){
 	}
 
 	return tmp;
-}
+}
\ No newline at end of file
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