more merge conflict resolution

This commit is contained in:
bigguy345 committed 2026-01-13 19:13:31 +02:00
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;