fix some merge issues

This commit is contained in:
asie 2018-12-31 22:46:38 +01:00
parent cf025be5ef
commit a6fa3b46de
2 changed files with 0 additions and 3 deletions

View File

@ -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;

View File

@ -1,2 +0,0 @@
CLASS cnj net/minecraft/client/util/GlfwUtil
METHOD b getTime ()D