From 2b6b8565917cb056dc42f1354fe4998b5cd83789 Mon Sep 17 00:00:00 2001 From: Adubbz Date: Thu, 10 Jan 2019 20:12:41 +1100 Subject: [PATCH] Oops --- .../assets/biomesoplenty/models/block/ash_block.json.rej | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 src/main/resources/assets/biomesoplenty/models/block/ash_block.json.rej diff --git a/src/main/resources/assets/biomesoplenty/models/block/ash_block.json.rej b/src/main/resources/assets/biomesoplenty/models/block/ash_block.json.rej deleted file mode 100644 index 75ccb07f5..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/ash_block.json.rej +++ /dev/null @@ -1,9 +0,0 @@ -diff a/src/main/resources/assets/biomesoplenty/models/block/ash_block.json b/src/main/resources/assets/biomesoplenty/models/block/ash_block.json (rejected hunks) -@@ -1,6 +1,6 @@ - { - "parent": "block/cube_all", - "textures": { -- "all": "biomesoplenty:blocks/ash_block" -+ "all": "biomesoplenty:block/ash_block" - } - }