fixed weird text added in

2026-06-22 01:46:21 -04:00
parent 21bd0c204e
commit 51b15daf2c
3 changed files with 0 additions and 24 deletions
--- a/src/player.h
+++ b/src/player.h
@@ -3,11 +3,8 @@

 // FUNction declaration! yay!!!
 // run by main.c constantly to allow player input.
-<<<<<<< HEAD
 extern bool dir;
 extern float curhorvel;
-=======
->>>>>>> dff3a5d2c4b8cd3d6d86ab9792e394cd0d27a619
 void UpdatePlayerControls(void);

 #endif