fix

a4ffbb56 · nanahira · f2a9714b · a4ffbb56 · afa4bdbc
Commit a4ffbb56 authored Feb 09, 2024 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 22 deletions

.gitignore .gitignore +0 -21

script script +1 -1

No files found.
--- a/.gitignore
+++ b/.gitignore
 # data files
 /beta
 /expansions
-<<<<<<< HEAD
 /specials
-=======
-/fonts
-/icon
-/pack
-/pics
-/replay
-/single
-/WindBot
-/cards.cdb
-/error.log
-/bot.conf
-/Bot.exe
-/bot
-
-/ygopro
-/ygopro.exe
-/ygopro.app
-/ikpMP3.dll
-/irrKlang.dll
->>>>>>> c198123788d9d57e8cdf136e9c2b7dc7a3dcf588

 # build files
 /bin

--- a/script @ afa4bdbc
+++ b/script @ afa4bdbc
-Subproject commit 4e240a6447a31b97e3cbeb45db367cb668b4399d
+Subproject commit afa4bdbc2917bb3d27b5d7dd95e1c8a97ea0076f