External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-23 03:51:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge origin/master

Browse source 
Conflicts:
	Mage.Sets/src/mage/cards/c/Cacophodon.java
	Mage.Sets/src/mage/cards/g/GiltgroveStalker.java
	Mage.Sets/src/mage/cards/h/HardyVeteran.java
	Mage.Sets/src/mage/sets/RivalsOfIxalan.java
This commit is contained in:
LevelX2 2018-01-06 12:48:46 +01:00
parent f66834fc19
commit d0fd325bfa
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Mage.Sets/src/mage/cards/c/Cacophodon.java
View file

@ -40,7 +40,6 @@ import mage.constants.Zone;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
/** /**
*
* *
* @author LevelX2 * @author LevelX2
*/ */