Merge branch 'nickv2002-patch-1'

card_db/en_us/cards.json

@@ -3554,17 +3554,6 @@
    "Action"
   ]
  },
- {
-  "cardset": "empires",
-  "cost": "2",
-  "description": "+1 Card\n +1 Action\nLook through your discard pile. You may reveal a Copper from it and put it into your hand.",
-  "extra": "You can look through your discard pile even if you know there is no Copper in it.",
-  "name": "Settlers",
-  "potcost": 0,
-  "types":[
-   "Action"
-  ]
- },
  {
   "cardset": "empires",
   "cost": "5",

tests/carddb_tests.py

@@ -9,7 +9,7 @@ class TestCardDB(unittest.TestCase):
         options, args = domdiv.parse_opts(['commandname'])
         options.data_path = '.'
         cards = domdiv.read_write_card_data(options)
-        self.assertEquals(len(cards), 349)
+        self.assertEquals(len(cards), 348)
         print set(c.cardset for c in cards)
         valid_cardsets = {
             u'prosperity',