merge: fixed merge conflic...

This commit is contained in:
AfonsoCMSousa 2026-05-25 15:28:57 +01:00
parent 6ff2768767
commit 922015b320
No known key found for this signature in database

5
.gitignore vendored
View File

@ -10,10 +10,5 @@
/.env /.env
/imgui.ini /imgui.ini
<<<<<<< HEAD
Playertracker Playertracker
*.json *.json
=======
PlayerTracker
compile_commands.json
>>>>>>> 0bb2efb088e7b2a81fec42ce54518f21ac4a9101