Merge branch 'main' of https://github.com/TimeEntropy/TicTacToe

TimeEntropy · Jun 28, 2024 · 981b1ea · 981b1ea
2 parents 4236c03 + 49301ac
commit 981b1ea
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/export_presets.cfg b/export_presets.cfg
@@ -8,9 +8,6 @@ custom_features=""
 export_filter="all_resources"
 include_filter=""
 exclude_filter="bin/*"
-<<<<<<< HEAD
-export_path="../井字棋.exe"
-=======
 export_path="bin/井字棋.exe"
 >>>>>>> 49301ac4c5bfd7da4027be6aa9b5cc3c33a1b171
 encryption_include_filters=""