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

Fix merge

Browse source
This commit is contained in:
Oleg Agafonov 2018-10-03 22:43:13 +04:00
parent 6bb478c342
commit 8fd6eb6313
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Mage.Sets/src/mage/sets/Battlebond.java
View file

@ -5,7 +5,6 @@ import mage.constants.Rarity;
import mage.constants.SetType;
/**
*
* @author TheElk801
*/
public final class Battlebond extends ExpansionSet {

2
Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
View file

@ -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