github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove Merge conflict artifacts.

Browse source
This commit is contained in:
Samuel Sandeen 2016-07-10 19:05:41 -04:00
parent 6cf04e9bd2
commit c7cdd792d0
2 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Mage.Sets/src/mage/sets/gatecrash/Hindervines.java
View file

@ -33,11 +33,6 @@ import mage.cards.CardImpl;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Rarity; import mage.constants.Rarity;
<<<<<<< HEAD
import mage.abilities.effects.common.PreventAllDamageByAllPermanentsEffect;
import mage.cards.CardImpl;
=======
>>>>>>> origin/master
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;

5
Mage.Sets/src/mage/sets/timeshifted/Darkness.java
View file

@ -28,12 +28,7 @@
package mage.sets.timeshifted; package mage.sets.timeshifted;
import java.util.UUID; import java.util.UUID;
<<<<<<< HEAD
import mage.constants.CardType;
import mage.constants.Rarity;
=======
>>>>>>> origin/master
import mage.abilities.effects.common.PreventAllDamageByAllPermanentsEffect; import mage.abilities.effects.common.PreventAllDamageByAllPermanentsEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.constants.CardType; import mage.constants.CardType;