From 3010ce17e538d8ccb564788ef4e1237a51e11202 Mon Sep 17 00:00:00 2001
From: John Alanbrook <john@pockle.world>
Date: Fri, 16 Dec 2022 19:37:40 +0000
Subject: [PATCH] Added stringifying escape & F keys; add sound, sys FFI;
 unconflict time.h and timer.h

---
 source/engine/input.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/source/engine/input.c b/source/engine/input.c
index d594513..6768b6b 100644
--- a/source/engine/input.c
+++ b/source/engine/input.c
@@ -104,11 +104,6 @@ void win_key_callback(GLFWwindow *w, int key, int scancode, int action, int mods
                 case GLFW_KEY_DOWN:
                     kkey = "down";
                     break;
-<<<<<<< HEAD
-            }
-
-            strcat(keystr, kkey);
-=======
 
                 case GLFW_KEY_LEFT_SHIFT:
                     kkey = "lshift";