From d0fd325bfa935e1bb29fe3c80c9db84fbaba1df5 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sat, 6 Jan 2018 12:48:46 +0100
Subject: [PATCH] Merge origin/master

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
---
 Mage.Sets/src/mage/cards/c/Cacophodon.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Mage.Sets/src/mage/cards/c/Cacophodon.java b/Mage.Sets/src/mage/cards/c/Cacophodon.java
index 687c4933d6a..02f7a696507 100644
--- a/Mage.Sets/src/mage/cards/c/Cacophodon.java
+++ b/Mage.Sets/src/mage/cards/c/Cacophodon.java
@@ -40,7 +40,6 @@ import mage.constants.Zone;
 import mage.target.TargetPermanent;
 
 /**
- *
  *
  * @author LevelX2
  */