merge: merge conflict

fix: added stuff to gitignore
2026-03-13 20:56:26 +00:00 · 2026-03-13 20:55:09 +00:00
2 changed files with 1 additions and 1 deletions
@@ -11,3 +11,4 @@
 /imgui.ini

 PlayerTracker
+compile_commands.json
@@ -1 +0,0 @@
-/Users/AfonsoCMSosua/Developer/C++/ACPlayer_tracker/build/compile_commands.json
Author	SHA1	Message	Date
AfonsoCMSousa	fe193cd648	merge: merge conflict	2026-03-13 20:56:26 +00:00
AfonsoCMSousa	f2e97f1214	fix: added stuff to gitignore	2026-03-13 20:55:09 +00:00
				`@@ -1 +0,0 @@`
				`/Users/AfonsoCMSosua/Developer/C++/ACPlayer_tracker/build/compile_commands.json`