1 files changed, 0 insertions, 1 deletions
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"