Commit 7ddff2f4 authored by Dan Demp's avatar Dan Demp

Fix merge issues

parent f50a76a6
Pipeline #1498 passed with stage
......@@ -10,12 +10,12 @@ public enum DeckType {
RANDOM_COMMANDER_DECK("lblRandomCommanderDecks"),
RANDOM_CARDGEN_COMMANDER_DECK("lblRandomCommanderCard-basedDecks"),
OATHBREAKER_DECK("lblOathbreakerDecks"),
TINY_LEADERS_DECKS("lblTinyLeadersDecks"),
BRAWL_DECKS("lblBrawlDecks"),
SCHEME_DECKS("lblSchemeDecks"),
PLANAR_DECKS("lblPlanarDecks"),
DRAFT_DECKS("lblDraftDecks"),
SEALED_DECKS("lblSealedDecks"),
TINY_LEADERS_DECK("lblTinyLeadersDecks"),
BRAWL_DECK("lblBrawlDecks"),
SCHEME_DECK("lblSchemeDecks"),
PLANAR_DECK("lblPlanarDecks"),
DRAFT_DECK("lblDraftDecks"),
SEALED_DECK("lblSealedDecks"),
PRECONSTRUCTED_DECK("lblPreconstructedDecks"),
QUEST_OPPONENT_DECK("lblQuestOpponentDecks"),
COLOR_DECK("lblRandomColorDecks"),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment