From 5abe9d3f5d91148a0e783f7829e89357c1042591 Mon Sep 17 00:00:00 2001
From: jesusalva <cpntb1@ymail.com>
Date: Sat, 17 Feb 2018 23:32:32 -0200
Subject: Fix unresolved merge conflict

---
 items.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/items.xml b/items.xml
index 3d371a7b..a3a9709f 100644
--- a/items.xml
+++ b/items.xml
@@ -3457,7 +3457,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
             <item from="-15" to="-19"/>
         </replace>
     </item>
-        <item id="2941"
+    <item id="2941"
         image="equipment/head/vikinghelmet.png"
         name="Viking Helmet"
         description="Rakinorf"
@@ -3472,11 +3472,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
             <item from="-15" to="-19"/>
         </replace>
     </item>
-<<<<<<< HEAD
     <item id="2942"
-=======
-        <item id="2942"
->>>>>>> delete evol maps
         image="equipment/head/centurionhelmet.png"
         name="Centurion Helmet"
         description="Rakinorf"
-- 
cgit v1.2.3-70-g09d2