Merge branch 'master' of github.com:Fluorohydride/ygopro

4f9eab12 · nanahira · 74e70bbc · c1981237 · 4f9eab12
Commit 4f9eab12 authored Feb 08, 2024 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 21 additions and 0 deletions

.gitignore .gitignore +21 -0

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