* Removed unwanted lines.

This commit is contained in:
LevelX2 2016-10-29 11:08:44 +02:00
parent f3f1765769
commit 70e2a0c4f4

View file

@ -29,15 +29,12 @@ package mage.sets;
import mage.cards.CardGraphicInfo; import mage.cards.CardGraphicInfo;
import mage.cards.ExpansionSet; import mage.cards.ExpansionSet;
<<<<<<< Updated upstream
=======
import mage.cards.h.HighTide; import mage.cards.h.HighTide;
import mage.constants.SetType;
>>>>>>> Stashed changes
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.constants.SetType; import mage.constants.SetType;
public class MediaInserts extends ExpansionSet { public class MediaInserts extends ExpansionSet {
private static final MediaInserts fINSTANCE = new MediaInserts(); private static final MediaInserts fINSTANCE = new MediaInserts();
public static MediaInserts getInstance() { public static MediaInserts getInstance() {