From 92bb1bf22d0cfa5120b140b38c97dbff6fb9a5ae Mon Sep 17 00:00:00 2001 From: Myrd Date: Sun, 6 Nov 2016 18:42:22 +0000 Subject: [PATCH] Fix up two more card filenames. --- .gitattributes | 4 ++-- .../c/{conjurer's_closet.txt => conjurers_closet.txt} | 0 .../res/cardsfolder/s/{sivvi's_valor.txt => sivvis_valor.txt} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename forge-gui/res/cardsfolder/c/{conjurer's_closet.txt => conjurers_closet.txt} (100%) rename forge-gui/res/cardsfolder/s/{sivvi's_valor.txt => sivvis_valor.txt} (100%) diff --git a/.gitattributes b/.gitattributes index a40685aab39..9ebb01b4233 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3973,9 +3973,9 @@ forge-gui/res/cardsfolder/c/congregate.txt svneol=native#text/plain forge-gui/res/cardsfolder/c/congregation_at_dawn.txt svneol=native#text/plain forge-gui/res/cardsfolder/c/conifer_strider.txt -text forge-gui/res/cardsfolder/c/conjured_currency.txt -text -forge-gui/res/cardsfolder/c/conjurer's_closet.txt -text forge-gui/res/cardsfolder/c/conjurers_ban.txt -text forge-gui/res/cardsfolder/c/conjurers_bauble.txt svneol=native#text/plain +forge-gui/res/cardsfolder/c/conjurers_closet.txt -text forge-gui/res/cardsfolder/c/conquer.txt svneol=native#text/plain forge-gui/res/cardsfolder/c/conquering_manticore.txt svneol=native#text/plain forge-gui/res/cardsfolder/c/conquerors_pledge.txt svneol=native#text/plain @@ -14009,8 +14009,8 @@ forge-gui/res/cardsfolder/s/sisters_of_stone_death.txt -text svneol=unset#text/p forge-gui/res/cardsfolder/s/sisters_of_stone_death_avatar.txt -text forge-gui/res/cardsfolder/s/sisters_of_the_flame.txt svneol=native#text/plain forge-gui/res/cardsfolder/s/sivitri_scarzam.txt svneol=native#text/plain -forge-gui/res/cardsfolder/s/sivvi's_valor.txt -text forge-gui/res/cardsfolder/s/sivvis_ruse.txt -text +forge-gui/res/cardsfolder/s/sivvis_valor.txt -text forge-gui/res/cardsfolder/s/sizzle.txt svneol=native#text/plain forge-gui/res/cardsfolder/s/skaab_goliath.txt -text forge-gui/res/cardsfolder/s/skaab_ruinator.txt -text diff --git a/forge-gui/res/cardsfolder/c/conjurer's_closet.txt b/forge-gui/res/cardsfolder/c/conjurers_closet.txt similarity index 100% rename from forge-gui/res/cardsfolder/c/conjurer's_closet.txt rename to forge-gui/res/cardsfolder/c/conjurers_closet.txt diff --git a/forge-gui/res/cardsfolder/s/sivvi's_valor.txt b/forge-gui/res/cardsfolder/s/sivvis_valor.txt similarity index 100% rename from forge-gui/res/cardsfolder/s/sivvi's_valor.txt rename to forge-gui/res/cardsfolder/s/sivvis_valor.txt