Dumb mistake

2020-02-13 12:27:05 +01:00 · 2020-02-13 12:27:05 +01:00 · 51044af762
parent 5c29005dbd
commit 51044af762
1 changed files with 0 additions and 4 deletions
--- 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, '^') ||