From 68b2e9449243d6ab3533348cea75a962a99fef84 Mon Sep 17 00:00:00 2001
From: Micksha <Micksha@users.noreply.github.com>
Date: Mon, 30 Jul 2018 19:49:55 +0200
Subject: fix issues in items.xml and head equipment

---
 graphics/sprites/equipment/head/brimmedhat.xml |   4 -
 graphics/sprites/equipment/head/fancyhat.xml   | 145 -------------------------
 2 files changed, 149 deletions(-)

(limited to 'graphics/sprites/equipment')

diff --git a/graphics/sprites/equipment/head/brimmedhat.xml b/graphics/sprites/equipment/head/brimmedhat.xml
index 4ecbe157..3bce3a6e 100644
--- a/graphics/sprites/equipment/head/brimmedhat.xml
+++ b/graphics/sprites/equipment/head/brimmedhat.xml
@@ -5,12 +5,8 @@ Copyright (C) 2014 Evol Online -->
     <imageset name="base"
               src="graphics/sprites/equipment/head/brimmedhat.png"
               width="27"
-<<<<<<< HEAD
               height="20"
               offsetY="-10"/>
-=======
-              height="20"/>
->>>>>>> 12e7af060a5bf1d129d95b8d6d6ec10c88fd48df
 
     <include file="equipment/head/pumpkinhat.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/head/fancyhat.xml b/graphics/sprites/equipment/head/fancyhat.xml
index 50575a01..1886b372 100644
--- a/graphics/sprites/equipment/head/fancyhat.xml
+++ b/graphics/sprites/equipment/head/fancyhat.xml
@@ -1,148 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<<<<<<< HEAD
-<!-- Authors: Alige, Reid
-Copyright (C) 2012-2013 Evol Online -->
-<sprite>
-    <imageset name="base"
-              src="graphics/sprites/equipment/head/fancyhat.png"
-              width="24"
-              height="18"/>
-
-    <action name="stand" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-48"/>
-        </animation>
-        <animation direction="left">
-            <frame index="0" offsetX="-1" offsetY="-48"/>
-        </animation>
-        <animation direction="up">
-            <frame index="1" offsetX="-2" offsetY="-48"/>
-        </animation>
-        <animation direction="right">
-            <frame index="1" offsetY="-48"/>
-        </animation>
-    </action>
-
-    <action name="walk" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-47" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-48" delay="160"/>
-            <frame index="0" offsetX="-1" offsetY="-47" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-48" delay="160"/>
-        </animation>
-        <animation direction="left">
-            <frame index="0" offsetX="-1" offsetY="-48" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-47" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-48" delay="160"/>
-            <frame index="0" offsetX="-1" offsetY="-47" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-48" delay="80"/>
-        </animation>
-        <animation direction="up">
-            <frame index="1" offsetX="-2" offsetY="-48" delay="80"/>
-            <frame index="1" offsetX="-2" offsetY="-49" delay="160"/>
-            <frame index="1" offsetX="-2" offsetY="-48" delay="80"/>
-            <frame index="1" offsetX="-2" offsetY="-49" delay="160"/>
-        </animation>
-        <animation direction="right">
-            <frame index="1" offsetY="-48" delay="80"/>
-            <frame index="1" offsetY="-47" delay="80"/>
-            <frame index="1" offsetY="-48" delay="160"/>
-            <frame index="1" offsetY="-47" delay="80"/>
-            <frame index="1" offsetY="-48" delay="80"/>
-        </animation>
-    </action>
-
-    <action name="attack" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-46" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-47" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-44" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-43" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="left">
-            <frame index="0" offsetX="3" offsetY="-49" delay="80"/>
-            <frame index="0" offsetX="3" offsetY="-50" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-47" delay="80"/>
-            <frame index="0" offsetX="-2" offsetY="-46" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="up">
-            <frame index="1" offsetX="-3" offsetY="-48" delay="240"/>
-            <frame index="1" offsetX="-3" offsetY="-46" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="right">
-            <frame index="1" offsetX="-5" offsetY="-49" delay="80"/>
-            <frame index="1" offsetX="-5" offsetY="-50" delay="80"/>
-            <frame index="1" offsetX="-2" offsetY="-47" delay="80"/>
-            <frame index="1" offsetX="-1" offsetY="-46" delay="80"/>
-            <end />
-        </animation>
-    </action>
-
-    <action name="attack_bow" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-47" delay="240"/>
-            <frame index="0" offsetX="-1" offsetY="-46" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-47" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="left">
-            <frame index="0" offsetX="2" offsetY="-48" delay="240"/>
-            <frame index="0" offsetX="4" offsetY="-49" delay="160"/>
-            <end />
-        </animation>
-        <animation direction="up">
-            <frame index="1" offsetX="-2" offsetY="-48" delay="160"/>
-            <frame index="1" offsetX="-3" offsetY="-48" delay="80"/>
-            <frame index="1" offsetX="-3" offsetY="-47" delay="80"/>
-            <frame index="1" offsetX="-3" offsetY="-48" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="right">
-            <frame index="1" offsetX="-3" offsetY="-48" delay="240"/>
-            <frame index="1" offsetX="-5" offsetY="-49" delay="160"/>
-            <end />
-        </animation>
-    </action>
-
-    <action name="sit" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-41"/>
-        </animation>
-        <animation direction="left">
-            <frame index="0" offsetX="3" offsetY="-39"/>
-        </animation>
-        <animation direction="up">
-            <frame index="1" offsetX="-1" offsetY="-40"/>
-        </animation>
-        <animation direction="right">
-            <frame index="1" offsetX="-6" offsetY="-39"/>
-        </animation>
-    </action>
-
-    <action name="sittop" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-37"/>
-        </animation>
-        <animation direction="left">
-            <frame index="0" offsetX="3" offsetY="-39"/>
-        </animation>
-        <animation direction="up">
-            <frame index="1" offsetX="-1" offsetY="-40"/>
-        </animation>
-        <animation direction="right">
-            <frame index="1" offsetX="-6" offsetY="-39"/>
-        </animation>
-    </action>
-
-    <action name="dead" imageset="base">
-        <animation direction="default">
-            <frame index="1" offsetX="38" offsetY="-3"/>
-        </animation>
-    </action>
-=======
 <!-- Author: Saulc
 Copyright (C) 2018 TMW2 -->
 <sprite>
@@ -153,5 +9,4 @@ Copyright (C) 2018 TMW2 -->
               offsetY="1"/>
 
     <include file="equipment/head/headmodel-male.xml"/>
->>>>>>> 12e7af060a5bf1d129d95b8d6d6ec10c88fd48df
 </sprite>
-- 
cgit v1.2.3-70-g09d2