From f7d48ca75dc106558a96eb5619bb9c0a2eca5026 Mon Sep 17 00:00:00 2001
From: Reid <reidyaro@gmail.com>
Date: Mon, 28 May 2012 21:31:07 +0200
Subject: Correct merge problems.

---
 items.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'items.xml')

diff --git a/items.xml b/items.xml
index d4829165..3c365c99 100644
--- a/items.xml
+++ b/items.xml
@@ -286,8 +286,13 @@ Multiple's colors dye is now setted up by itemcolors.xml.
         name="Half Coconut"
         description="The inside seems delicious."
         effect="+40 HP"
-        type="usable"
         weight="14"/>
+    <item id="513"
+        image="food/coconut.png"
+        name="Coconut"
+        description=""
+        type="usable"
+        weight="30"/>
 
 
     <!-- Generic -->
-- 
cgit v1.2.3-70-g09d2