summaryrefslogtreecommitdiff
path: root/items.xml
diff options
context:
space:
mode:
authorSaulc <lucashelaine14@gmail.com>2018-02-18 02:15:22 +0100
committerSaulc <lucashelaine14@gmail.com>2018-02-18 02:15:22 +0100
commitb839732bb6c3d9b99b9b005ad992eca7b3bd4fb1 (patch)
tree4335745fe6434e956fff26c1b52a449d85e11af4 /items.xml
parent37f6978bcf1f45970bd7c6c15f6402fc2c0d1366 (diff)
downloadclientdata-b839732bb6c3d9b99b9b005ad992eca7b3bd4fb1.tar.gz
clientdata-b839732bb6c3d9b99b9b005ad992eca7b3bd4fb1.tar.bz2
clientdata-b839732bb6c3d9b99b9b005ad992eca7b3bd4fb1.tar.xz
clientdata-b839732bb6c3d9b99b9b005ad992eca7b3bd4fb1.zip
test
Diffstat (limited to 'items.xml')
-rw-r--r--items.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/items.xml b/items.xml
index 7db308a3..3d371a7b 100644
--- a/items.xml
+++ b/items.xml
@@ -3472,7 +3472,11 @@ 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"