1 files changed, 0 insertions, 1 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.
 	*/