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 -
1 file changed, 1 deletion(-)
(limited to 'main.cpp')
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.
*/
--
cgit v1.2.3