Merge branch 'master' of /root/7210

423b315e · Momobako · 1a6731ee · 153e55fe · 423b315e · 423b315e
Commit 423b315e authored Mar 07, 2018 by Momobako
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

.gitignore .gitignore +1 -0

appveyor.yml appveyor.yml +1 -1

cards.cdb cards.cdb +0 -0

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -56,6 +56,7 @@
 /single
 /sound
 /update
+/update*

 # ygopro main program
 /ygopro

--- a/appveyor.yml
+++ b/appveyor.yml
@@ -91,7 +91,7 @@ after_build:
  - cd ..

  - cp -rf ygopro/cards.cdb windbot
-  - cp -rf config.json config.user.json  
+  - cp -rf config-build config
  - cp -rf ../node-v9.1.0-win-x64.zip .
  - 7z x node-v9.1.0-win-x64.zip
  - rm -rf node-v9.1.0-win-x64.zip

--- a/cards.cdb
+++ b/cards.cdb