From a6fa3b46dec38ddfa4e458992b01344b34695d79 Mon Sep 17 00:00:00 2001 From: asie Date: Mon, 31 Dec 2018 22:46:38 +0100 Subject: [PATCH] fix some merge issues --- mappings/net/minecraft/block/entity/SignBlockEntity.mapping | 1 - mappings/net/minecraft/client/util/GLFWUtil.mapping | 2 -- 2 files changed, 3 deletions(-) delete mode 100644 mappings/net/minecraft/client/util/GLFWUtil.mapping diff --git a/mappings/net/minecraft/block/entity/SignBlockEntity.mapping b/mappings/net/minecraft/block/entity/SignBlockEntity.mapping index 2315530bc6..cdf90afec4 100644 --- a/mappings/net/minecraft/block/entity/SignBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SignBlockEntity.mapping @@ -8,7 +8,6 @@ CLASS bom net/minecraft/block/entity/SignBlockEntity FIELD j editor Larb; FIELD k textBeingEdited [Ljava/lang/String; FIELD l textColor Lavl; - FIELD l color Lavl; METHOD K_ shouldBroadcastConsoleToOps ()Z METHOD a sendCommandFeedback ()Z METHOD a getTextOnRow (I)Ljd; diff --git a/mappings/net/minecraft/client/util/GLFWUtil.mapping b/mappings/net/minecraft/client/util/GLFWUtil.mapping deleted file mode 100644 index 833b2f7bf9..0000000000 --- a/mappings/net/minecraft/client/util/GLFWUtil.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS cnj net/minecraft/client/util/GlfwUtil - METHOD b getTime ()D