From 3e708f5696c91e62b2554d7a88a87af8a71de66a Mon Sep 17 00:00:00 2001
From: MasterGordon <gologo.x@gmail.com>
Date: Sat, 9 Jun 2018 20:42:53 +0200
Subject: [PATCH] edit

---
 js/items.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/js/items.json b/js/items.json
index db64c7c..06b97d1 100644
--- a/js/items.json
+++ b/js/items.json
@@ -170,7 +170,6 @@
   }, {
     "id": 42,
     "name": "glass",
-<<<<<<< HEAD
     "value": 100
   }, {
     "id": 43,
@@ -196,9 +195,6 @@
     "id": 48,
     "name": "bottleapplevenegar",
     "value": 100
-=======
-    "value": 120
->>>>>>> bd0f8129c4cb654727664b0b7078fc2ee1ec72d8
   }],
   "minerals": {
     "nameFromId": ["bauxite",