revert erroneous travis commit

src/domdiv/card_db/it/sets_it.json

@@ -135,24 +135,5 @@
         "set_name": "Seaside",
         "set_text": "All you ask is a tall ship and a star to steer her by. And someone who knows how to steer ships using stars. You finally got some of those rivers you'd wanted, and they led to the sea. These are dangerous, pirate-infested waters, and you cautiously send rat-infested ships across them, to establish lucrative trade at far-off merchant-infested ports. First, you will take over some islands, as a foothold. The natives seem friendly enough, crying their peace cries, and giving you spears and poison darts before you are even close enough to accept them properly. When you finally reach those ports you will conquer them, and from there you will look for more rivers. One day, all the rivers will be yours.\nThis is the 2nd addition to <i>Dominion</i>. It adds 26 new Kingdom cards to <i>Dominion</i>. Its central theme is your next turn; there are cards that do something this turn and next, cards that set up your next turn, and other ways to step outside of the bounds of a normal turn.",
         "text_icon": "S"
-    },
-    "menagerie": {
-        "set_name": "Menagerie",
-<<<<<<< Updated upstream
-        "text_icon": "*",
-        "set_text": ""
-    },
-    "menagerie extras": {
-        "set_name": "Menagerie Extras",
-        "text_icon": "*",
-=======
-        "text_icon": "M",
-        "set_text": "Dominion, that’s what you’re trying to achieve. This time with animals! They each have a lesson to teach, whether it’s how to spit really far, or what kind of grass tastes the best. It’s a lot to keep track of, but you’re like an elephant: you remember everything. And you’re afraid of mice. You’ve taken up riding. Horses are intimidating; they say you can lead a horse to water, but you haven’t managed it. So you’re working your way up, starting with dogs. So far so good; the dog hasn’t bucked you off yet. Your menagerie got off to a poor start, with just a goat, two rats, and the advisor who suggested starting a menagerie. You couldn’t get that fox you wanted, but it was probably bad anyway. Now you’ve got some camels, which are just as useless for sewing as you’d been warned, and a turtle that can hold its breath for longer than anyone can stay interested. Soon the animal kingdom will be yours.\nThis is the 13th expansion to <i>Dominion</i>. It has 400 cards, with 30 new Kingdom cards. There are Horses that save a draw for later, Exile mats that cards can be sent to and rescued from, and Ways that give Actions another option. Events return."
-    },
-    "menagerie extras": {
-        "set_name": "Menagerie Extras",
-        "text_icon": "M",
->>>>>>> Stashed changes
-        "set_text": ""
     }
 }

src/domdiv/card_db/it/types_it.json

@@ -35,7 +35,5 @@
     "Treasure": "Treasure",
     "Victory": "Victory",
     "Zombie": "Zombie",
-    "Projects": "Projects",
-    "Way": "Way",
-    "Ways": "Ways"
+    "Projects": "Projects"
 }