From 74f70c61a37c94727e1411696f050cf588cf3446 Mon Sep 17 00:00:00 2001
From: max-001 <maxsmits21@kpnmail.nl>
Date: Fri, 20 Dec 2024 12:05:52 +0100
Subject: Fix merge issues

---
 game/main.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'game')

diff --git a/game/main.cpp b/game/main.cpp
index af14ed5..237c8ce 100644
--- a/game/main.cpp
+++ b/game/main.cpp
@@ -1,3 +1 @@
-int main() {
-
-}
+int main() {}
-- 
cgit v1.2.3