From 5f5014313aebf22fda39b85b76f4d2e5c4383af8 Mon Sep 17 00:00:00 2001
From: Moritz Zwerger <bixilon@bixilon.de>
Date: Fri, 6 Oct 2023 13:20:49 +0200
Subject: [PATCH] fix rebase

---
 _/items.json | 33 ---------------------------------
 1 file changed, 33 deletions(-)

diff --git a/_/items.json b/_/items.json
index cb1e199..90c4019 100644
--- a/_/items.json
+++ b/_/items.json
@@ -413,12 +413,6 @@
   "chest": {
     "id": 54
   },
-<<<<<<< HEAD
-  "redstone_wire": {
-    "id": 55
-  },
-=======
->>>>>>> 7194ff2 (fix some item ids)
   "diamond_ore": {
     "id": 56
   },
@@ -428,27 +422,12 @@
   "crafting_table": {
     "id": 58
   },
-<<<<<<< HEAD
-  "wheat": {
-    "id": 59
-  },
-=======
->>>>>>> 7194ff2 (fix some item ids)
   "farmland": {
     "id": 60
   },
   "furnace": {
     "id": 61
   },
-<<<<<<< HEAD
-  "sign": {
-    "id": 63
-  },
-  "oak_door": {
-    "id": 64
-  },
-=======
->>>>>>> 7194ff2 (fix some item ids)
   "ladder": {
     "id": 65
   },
@@ -464,12 +443,6 @@
   "stone_pressure_plate": {
     "id": 70
   },
-<<<<<<< HEAD
-  "iron_door": {
-    "id": 71
-  },
-=======
->>>>>>> 7194ff2 (fix some item ids)
   "oak_pressure_plate": {
     "id": 72
   },
@@ -497,12 +470,6 @@
   "clay": {
     "id": 82
   },
-<<<<<<< HEAD
-  "sugar_cane": {
-    "id": 83
-  },
-=======
->>>>>>> 7194ff2 (fix some item ids)
   "jukebox": {
     "id": 84
   },