From c7cdd792d04a76fe1e0cc24a604af3967ab4b7fc Mon Sep 17 00:00:00 2001
From: Samuel Sandeen <samuelesandeen@gmail.com>
Date: Sun, 10 Jul 2016 19:05:41 -0400
Subject: [PATCH] Remove Merge conflict artifacts.

---
 Mage.Sets/src/mage/sets/gatecrash/Hindervines.java | 5 -----
 Mage.Sets/src/mage/sets/timeshifted/Darkness.java  | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/gatecrash/Hindervines.java b/Mage.Sets/src/mage/sets/gatecrash/Hindervines.java
index 2486f81c8a6..bf4c2322db0 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/Hindervines.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/Hindervines.java
@@ -33,11 +33,6 @@ import mage.cards.CardImpl;
 import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.Rarity;
-<<<<<<< HEAD
-import mage.abilities.effects.common.PreventAllDamageByAllPermanentsEffect;
-import mage.cards.CardImpl;
-=======
->>>>>>> origin/master
 import mage.counters.CounterType;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.Predicates;
diff --git a/Mage.Sets/src/mage/sets/timeshifted/Darkness.java b/Mage.Sets/src/mage/sets/timeshifted/Darkness.java
index 4fd5121abcb..945668e01a9 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/Darkness.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/Darkness.java
@@ -28,12 +28,7 @@
 package mage.sets.timeshifted;
 
 import java.util.UUID;
-<<<<<<< HEAD
 
-import mage.constants.CardType;
-import mage.constants.Rarity;
-=======
->>>>>>> origin/master
 import mage.abilities.effects.common.PreventAllDamageByAllPermanentsEffect;
 import mage.cards.CardImpl;
 import mage.constants.CardType;