generated from AfonsoCMSousa/CPP-Template
merge: fixed merge conflic...
This commit is contained in:
parent
6ff2768767
commit
922015b320
5
.gitignore
vendored
5
.gitignore
vendored
@ -10,10 +10,5 @@
|
||||
/.env
|
||||
/imgui.ini
|
||||
|
||||
<<<<<<< HEAD
|
||||
Playertracker
|
||||
*.json
|
||||
=======
|
||||
PlayerTracker
|
||||
compile_commands.json
|
||||
>>>>>>> 0bb2efb088e7b2a81fec42ce54518f21ac4a9101
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user