summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjesusalva <cpntb1@ymail.com>2018-02-17 23:32:32 -0200
committerjesusalva <cpntb1@ymail.com>2018-02-17 23:32:32 -0200
commit5abe9d3f5d91148a0e783f7829e89357c1042591 (patch)
treeb58f54eaffddd1378b2705a9da1789725b42666e
parent2071b8231a7a6cfbdd4d6d0a6fdee7c1c85fa378 (diff)
downloadclientdata-5abe9d3f5d91148a0e783f7829e89357c1042591.tar.gz
clientdata-5abe9d3f5d91148a0e783f7829e89357c1042591.tar.bz2
clientdata-5abe9d3f5d91148a0e783f7829e89357c1042591.tar.xz
clientdata-5abe9d3f5d91148a0e783f7829e89357c1042591.zip
Fix unresolved merge conflict
-rw-r--r--items.xml6
1 files changed, 1 insertions, 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"