From 3642e0e39293ffe8229f30a52ce0ada35553b886 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sun, 10 Jun 2018 01:07:53 -0300
Subject: [License Complying] Remove mecha-medallion, license is incompatible

---
 graphics/items/equipment/charms/mechamedallion.png | Bin 2390 -> 0 bytes
 items.xml                                          |   2 ++
 2 files changed, 2 insertions(+)
 delete mode 100644 graphics/items/equipment/charms/mechamedallion.png

diff --git a/graphics/items/equipment/charms/mechamedallion.png b/graphics/items/equipment/charms/mechamedallion.png
deleted file mode 100644
index b0ff8fa9..00000000
Binary files a/graphics/items/equipment/charms/mechamedallion.png and /dev/null differ
diff --git a/items.xml b/items.xml
index 79f4fc1e..4a7f4471 100644
--- a/items.xml
+++ b/items.xml
@@ -2377,6 +2377,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="equip-necklace"
 		weight="50">
 	</item>
+    <!--
 	<item id="1158"
 		image="equipment/charms/mechamedallion.png"
 		name="Mecha Medallion"
@@ -2385,6 +2386,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="equip-necklace"
 		weight="40">
 	</item>
+    -->
 	<item id="1159"
 		image="equipment/charms/oldtowel.png"
 		name="Old Towel"
-- 
cgit v1.2.3-70-g09d2