From ca33512c446526a418669c96289371793d09d0fd Mon Sep 17 00:00:00 2001
From: Micksha <Micksha@users.noreply.github.com>
Date: Sun, 21 Oct 2018 20:04:19 +0200
Subject: Add items for Melinda: Fine dress, beer

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

(limited to 'items.xml')

diff --git a/items.xml b/items.xml
index b191937c..3af70065 100644
--- a/items.xml
+++ b/items.xml
@@ -1014,10 +1014,16 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         type="equip-torso"
         weight="240"
         colors="simple"
+<<<<<<< 9e0bdba0ea0f30537713a567ea39b05820b819d9
         iconColors="simple"
         maxFloorOffset="10">
         <sprite gender="unisex">equipment/chest/finedress-male.xml</sprite>
         <sprite gender="female">equipment/chest/finedress-female.xml</sprite>
+=======
+        maxFloorOffset="10">
+        <sprite gender="unisex">equipment/chest/finedress-male.xml|#606060,aaaaaa,dddddd,fcfcfc</sprite>
+        <sprite gender="female">equipment/chest/finedress-female.xml||#606060,aaaaaa,dddddd,fcfcfc</sprite>
+>>>>>>> Add items for Melinda: Fine dress, beer
     </item>
     <item id="1309"
         image="equipment/chest/warlordplate.png"
-- 
cgit v1.2.3-60-g2f50