1 files changed, 0 insertions, 1 deletions
diff --git a/main.cpp b/main.cpp
index 75bc0c3..4f6e4ab 100644
--- a/main.cpp
+++ b/main.cpp
@@ -624,7 +624,6 @@ void render(){
 	player->inv->draw();
 
 	/*
-<<<<<<< HEAD
 	 *	Here we draw a black overlay if it's been requested.
 	*/