From aa4b5f38c5b981f8c869ec4257fbc3a37966d5db Mon Sep 17 00:00:00 2001
From: Evan Kranzler <theelk801@gmail.com>
Date: Fri, 8 Sep 2017 18:30:42 -0400
Subject: [PATCH] fixed conflicts

---
 Mage.Sets/src/mage/cards/m/MarduHordechief.java  | 2 +-
 Mage.Sets/src/mage/cards/m/MarduWarshrieker.java | 2 +-
 Mage.Sets/src/mage/cards/p/PerfectedForm.java    | 2 +-
 Mage.Sets/src/mage/cards/t/TimelyHordemate.java  | 2 +-
 Mage.Sets/src/mage/cards/w/WarNameAspirant.java  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/m/MarduHordechief.java b/Mage.Sets/src/mage/cards/m/MarduHordechief.java
index 1d2e30556f3..f2392faa3ca 100644
--- a/Mage.Sets/src/mage/cards/m/MarduHordechief.java
+++ b/Mage.Sets/src/mage/cards/m/MarduHordechief.java
@@ -47,7 +47,7 @@ import mage.watchers.common.PlayerAttackedWatcher;
 public class MarduHordechief extends CardImpl {
 
     public MarduHordechief(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}");
         this.subtype.add(SubType.HUMAN);
         this.subtype.add(SubType.WARRIOR);
 
diff --git a/Mage.Sets/src/mage/cards/m/MarduWarshrieker.java b/Mage.Sets/src/mage/cards/m/MarduWarshrieker.java
index 420b09859f6..daf3d7ea175 100644
--- a/Mage.Sets/src/mage/cards/m/MarduWarshrieker.java
+++ b/Mage.Sets/src/mage/cards/m/MarduWarshrieker.java
@@ -47,7 +47,7 @@ import mage.watchers.common.PlayerAttackedWatcher;
 public class MarduWarshrieker extends CardImpl {
 
     public MarduWarshrieker(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}");
         this.subtype.add(SubType.ORC);
         this.subtype.add(SubType.SHAMAN);
 
diff --git a/Mage.Sets/src/mage/cards/p/PerfectedForm.java b/Mage.Sets/src/mage/cards/p/PerfectedForm.java
index 71fc378da7a..48235b78699 100644
--- a/Mage.Sets/src/mage/cards/p/PerfectedForm.java
+++ b/Mage.Sets/src/mage/cards/p/PerfectedForm.java
@@ -42,7 +42,7 @@ import mage.constants.SubType;
 public class PerfectedForm extends CardImpl {
 
     public PerfectedForm(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "");
         this.subtype.add(SubType.INSECT);
         this.subtype.add(SubType.HORROR);
         this.power = new MageInt(5);
diff --git a/Mage.Sets/src/mage/cards/t/TimelyHordemate.java b/Mage.Sets/src/mage/cards/t/TimelyHordemate.java
index 657ceaaf602..4071328f5c5 100644
--- a/Mage.Sets/src/mage/cards/t/TimelyHordemate.java
+++ b/Mage.Sets/src/mage/cards/t/TimelyHordemate.java
@@ -57,7 +57,7 @@ public class TimelyHordemate extends CardImpl {
     }
 
     public TimelyHordemate(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}");
         this.subtype.add(SubType.HUMAN);
         this.subtype.add(SubType.WARRIOR);
 
diff --git a/Mage.Sets/src/mage/cards/w/WarNameAspirant.java b/Mage.Sets/src/mage/cards/w/WarNameAspirant.java
index a9144ae0251..08c36a5a4c8 100644
--- a/Mage.Sets/src/mage/cards/w/WarNameAspirant.java
+++ b/Mage.Sets/src/mage/cards/w/WarNameAspirant.java
@@ -58,7 +58,7 @@ public class WarNameAspirant extends CardImpl {
     }
 
     public WarNameAspirant(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}");
         this.subtype.add(SubType.HUMAN);
         this.subtype.add(SubType.WARRIOR);