mirrors/mindcraft
1
0
Fork 0
mirror of https://github.com/kolbytn/mindcraft.git synced 2025-04-29 19:44:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix merge conflict

Browse source
This commit is contained in:
MaxRobinsonTheGreat 2025-03-11 10:45:25 -05:00
parent 7ca26a70b4
commit c1ce3bf9b6
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitignore vendored
View file

@ -19,10 +19,5 @@ experiments/
andy_*.json andy_*.json
jill_*.json jill_*.json
src/models/logs/* src/models/logs/*
<<<<<<< HEAD
server_data/*
server_data_*/*
=======
server_data* server_data*
results/* results/*
>>>>>>> d70491e5974a973b96c47f0515c2722b82c9b253