edit

2018-06-09 20:42:53 +02:00 · 2018-06-09 20:42:53 +02:00 · 3e708f5696
parent 7a7867a185
commit 3e708f5696
1 changed files with 0 additions and 4 deletions
--- 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",