From 23898a47b0ca4563b61ba573cd5f5c16640dbdca 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 ----
 1 file changed, 4 deletions(-)

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>
-- 
cgit v1.2.3-70-g09d2