From 70e2a0c4f4cc05e13e4d29d9451928d6211f60c2 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sat, 29 Oct 2016 11:08:44 +0200
Subject: [PATCH] * Removed unwanted lines.

---
 Mage.Sets/src/mage/sets/MediaInserts.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/MediaInserts.java b/Mage.Sets/src/mage/sets/MediaInserts.java
index 3ece476f55..773ec322d4 100644
--- a/Mage.Sets/src/mage/sets/MediaInserts.java
+++ b/Mage.Sets/src/mage/sets/MediaInserts.java
@@ -29,15 +29,12 @@ package mage.sets;
 
 import mage.cards.CardGraphicInfo;
 import mage.cards.ExpansionSet;
-<<<<<<< Updated upstream
-=======
 import mage.cards.h.HighTide;
-import mage.constants.SetType;
->>>>>>> Stashed changes
 import mage.constants.Rarity;
 import mage.constants.SetType;
 
 public class MediaInserts extends ExpansionSet {
+
     private static final MediaInserts fINSTANCE = new MediaInserts();
 
     public static MediaInserts getInstance() {