From 8fd6eb63131e5d9111145a3654a783d87bbbae49 Mon Sep 17 00:00:00 2001
From: Oleg Agafonov <jaydi85@gmail.com>
Date: Wed, 3 Oct 2018 22:43:13 +0400
Subject: [PATCH] Fix merge

---
 Mage.Sets/src/mage/sets/Battlebond.java             | 13 ++++++-------
 .../test/java/mage/verify/VerifyCardDataTest.java   |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/Battlebond.java b/Mage.Sets/src/mage/sets/Battlebond.java
index 687614bd2d..e01ffafdef 100644
--- a/Mage.Sets/src/mage/sets/Battlebond.java
+++ b/Mage.Sets/src/mage/sets/Battlebond.java
@@ -5,18 +5,17 @@ import mage.constants.Rarity;
 import mage.constants.SetType;
 
 /**
- *
  * @author TheElk801
  */
 public final class Battlebond extends ExpansionSet {
-    
+
     private static final Battlebond instance = new Battlebond();
-    
+
     public static Battlebond getInstance() {
         return instance;
     }
-    
-    
+
+
     private Battlebond() {
         super("Battlebond", "BBD", ExpansionSet.buildDate(2018, 6, 8), SetType.SUPPLEMENTAL);
         this.blockName = "Battlebond";
@@ -28,7 +27,7 @@ public final class Battlebond extends ExpansionSet {
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 8;
-        
+
         cards.add(new SetCardInfo("Aim High", 189, Rarity.UNCOMMON, mage.cards.a.AimHigh.class));
         cards.add(new SetCardInfo("Angel of Retribution", 86, Rarity.UNCOMMON, mage.cards.a.AngelOfRetribution.class));
         cards.add(new SetCardInfo("Angelic Chorus", 87, Rarity.RARE, mage.cards.a.AngelicChorus.class));
@@ -286,5 +285,5 @@ public final class Battlebond extends ExpansionSet {
         cards.add(new SetCardInfo("Zndrsplt's Judgment", 43, Rarity.RARE, mage.cards.z.ZndrspltsJudgment.class));
         cards.add(new SetCardInfo("Zndrsplt, Eye of Wisdom", 5, Rarity.RARE, mage.cards.z.ZndrspltEyeOfWisdom.class));
     }
-    
+
 }
diff --git a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
index 7dc7c4fa76..34869ff85b 100644
--- a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
+++ b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
@@ -277,7 +277,7 @@ public class VerifyCardDataTest {
         printMessages(list, true);
     }
 
-    private String extractShortClass(Class<? extends TokenImpl> tokenClass) {
+    private String extractShortClass(Class<? extends Object> tokenClass) {
         String origin = tokenClass.getName();
         if (origin.contains("$")) {
             // inner classes, example: mage.cards.f.FigureOfDestiny$FigureOfDestinyToken3