2 Commits
Author SHA1 Message Date
AfonsoCMSousa 1d9901d0fd merge: fixed merge conflic... 2026-05-25 15:30:44 +01:00
AfonsoCMSousa 922015b320 merge: fixed merge conflic... 2026-05-25 15:28:57 +01:00
+1 -6
View File
@@ -10,10 +10,5 @@
/.env /.env
/imgui.ini /imgui.ini
<<<<<<< HEAD
Playertracker
*.json
=======
PlayerTracker PlayerTracker
compile_commands.json *.json
>>>>>>> 0bb2efb088e7b2a81fec42ce54518f21ac4a9101