2 files changed, 1 insertions, 2 deletions

diff --git a/main.cpp b/main.cpp
index 97f788c..0adb0d5 100644
--- a/main.cpp
+++ b/main.cpp
@@ -626,7 +626,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 2df0712..971325c 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -1656,4 +1656,4 @@ World *loadWorldFromXMLNoSave(const char *path){
 	}
 
 	return tmp;
-}
+}
\ No newline at end of file