summaryrefslogtreecommitdiff
path: root/items.xml
diff options
context:
space:
mode:
authornmaligec <wouldnot@hotmail.com>2011-01-05 05:28:04 -0500
committernmaligec <wouldnot@hotmail.com>2011-01-05 05:28:04 -0500
commit1a78870bcf89cf9336f6a758f94afd5ce79b5040 (patch)
tree139f9a865b7da14543528a355de54176b389d847 /items.xml
parentff1acc14dcc3683aad70907c3748f3f8faf552dc (diff)
downloadclientdata-1a78870bcf89cf9336f6a758f94afd5ce79b5040.tar.gz
clientdata-1a78870bcf89cf9336f6a758f94afd5ce79b5040.tar.bz2
clientdata-1a78870bcf89cf9336f6a758f94afd5ce79b5040.tar.xz
clientdata-1a78870bcf89cf9336f6a758f94afd5ce79b5040.zip
quick fixes
Diffstat (limited to 'items.xml')
-rw-r--r--items.xml4
1 files changed, 0 insertions, 4 deletions
diff --git a/items.xml b/items.xml
index 4c37f43b..bdc04e5c 100644
--- a/items.xml
+++ b/items.xml
@@ -1050,11 +1050,7 @@
image="weapon-polearm-spear.png"
name="Spear"
description="A light spear with a wooden pole."
-<<<<<<< HEAD
effect="+40 Damage, 1 Range"
-=======
- effect="+50 Damage"
->>>>>>> c9008a1f4b6b7616056fb593dad2e5a32589f596
type="equip-2hand"
weapon_type="11"
weapon-type="polearm"