1 files changed, 1 insertions, 25 deletions
diff --git a/src/UIClass.cpp b/src/UIClass.cpp
index bf76336..56a9f47 100644
--- a/src/UIClass.cpp
+++ b/src/UIClass.cpp
@@ -1,5 +1,5 @@
-<<<<<<< HEAD
 #include <UIClass.h>
+
 extern Player player;
 
 void UIClass::handleEvents(){
@@ -37,27 +37,3 @@ void UIClass::handleEvents(){
 		}
 	}
 }
-=======
-#include <UIClass.h>
-
-void UIClass::handleEvents(){
-	SDL_Event e;
-	while(SDL_PollEvent(&e)){
-		switch(e.type){
-		case SDL_QUIT:
-			gameRunning=false;
-			break;
-		case SDL_KEYDOWN:
-			switch(e.key.keysym.sym){
-			case 27:
-				gameRunning=false;
-				break;
-			default:
-				break;
-			}
-		default:
-			break;
-		}
-	}
-}
->>>>>>> origin/master