From 1a78870bcf89cf9336f6a758f94afd5ce79b5040 Mon Sep 17 00:00:00 2001
From: nmaligec <wouldnot@hotmail.com>
Date: Wed, 5 Jan 2011 05:28:04 -0500
Subject: quick fixes

---
 items.xml | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'items.xml')

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"
-- 
cgit v1.2.3-60-g2f50