From a8661e2c42932c02c7b3e68240df9cbcad7d39ca Mon Sep 17 00:00:00 2001
From: Micksha <Micksha@users.noreply.github.com>
Date: Tue, 6 Nov 2018 13:40:51 +0100
Subject: fix items.xml

---
 items.xml | 1 -
 1 file changed, 1 deletion(-)

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"
-- 
cgit v1.2.3-70-g09d2