From 51044af762db824cd86f2f5dc637b7a7176ad6cb Mon Sep 17 00:00:00 2001
From: KikooDX <kikoodissident@gmail.com>
Date: Thu, 13 Feb 2020 12:27:05 +0100
Subject: [PATCH] Dumb mistake

---
 src/main.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main.c b/src/main.c
index e63fdd1..222a027 100644
--- a/src/main.c
+++ b/src/main.c
@@ -112,11 +112,7 @@ int main(void)
     {
       player_x = start_x;
       player_y = start_y;
-<<<<<<< HEAD
       vspd = 0;
-=======
-      vpsd = 0;
->>>>>>> 76f2a399818618f6c375d00b2d7e9d8a3360fb90
     }
     //elevator collision and raise
     if (collide(player_x - 1, player_y, level, '^') ||