summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicksha <Micksha@users.noreply.github.com>2018-11-06 13:40:51 +0100
committerMicksha <Micksha@users.noreply.github.com>2018-11-06 13:40:51 +0100
commita8661e2c42932c02c7b3e68240df9cbcad7d39ca (patch)
tree82932f51543815bb24f8a977596b688c873189de
parent8acda79dd895be296f16cd0425dafd1c36eda02f (diff)
downloadclientdata-a8661e2c42932c02c7b3e68240df9cbcad7d39ca.tar.gz
clientdata-a8661e2c42932c02c7b3e68240df9cbcad7d39ca.tar.bz2
clientdata-a8661e2c42932c02c7b3e68240df9cbcad7d39ca.tar.xz
clientdata-a8661e2c42932c02c7b3e68240df9cbcad7d39ca.zip
fix items.xml
-rw-r--r--items.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/items.xml b/items.xml
index c020ba44..516ca4b6 100644
--- a/items.xml
+++ b/items.xml
@@ -620,7 +620,6 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
useButton="Drink"
type="usable"
weight="128"/>
->>>>>>> Add 4 different potions, implement 3 healing -/ 3 mana -/ concentration and iron potions. only healing potions working for now.
<!-- Generic Items -->
<item id="700"