From 922015b3205b5140a249a872d6c006e4d93cf00e Mon Sep 17 00:00:00 2001
From: AfonsoCMSousa <afonsoclerigomendesousa@gmail.com>
Date: Mon, 25 May 2026 15:28:57 +0100
Subject: [PATCH] merge: fixed merge conflic...

---
 .gitignore | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0bf55c9..1f0cc4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,10 +10,5 @@
 /.env
 /imgui.ini
 
-<<<<<<< HEAD
 Playertracker
 *.json
-=======
-PlayerTracker
-compile_commands.json
->>>>>>> 0bb2efb088e7b2a81fec42ce54518f21ac4a9101