mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-12 03:47:27 +00:00
more merge conflict resolution
This commit is contained in:
1 parent
1df05406c8
commit
8c8f37e75d
4 files changed
+7
-4
No files matched your search
@@ -79,7 +79,7 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb
|
||||
}
|
||||
|
||||
/** Fullscreen toggle button drawn at top-right of viewport */
|
||||
private final FullscreenButton fullscreenButton = new FullscreenButton();
|
||||
public final FullscreenButton fullscreenButton = new FullscreenButton();
|
||||
|
||||
public GuiScriptInterface() {
|
||||
this.drawDefaultBackground = true;
|
||||
|
||||
Reference in new issue
Block a user