From b2fe9fd7db976f9a1968d3c76a11d280e795147b Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Thu, 17 Jul 2025 10:00:05 -0700 Subject: [PATCH] apprt/gtk-ng: fix merge conflict --- src/apprt/gtk-ng/class/application.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apprt/gtk-ng/class/application.zig b/src/apprt/gtk-ng/class/application.zig index bbe3bfcb5..fc6f574d5 100644 --- a/src/apprt/gtk-ng/class/application.zig +++ b/src/apprt/gtk-ng/class/application.zig @@ -779,7 +779,7 @@ const Action = struct { /// given the runtime environment or configuration. /// /// This must be called BEFORE GTK initialization. -fn setGtkEnv(config: *const Config) error{NoSpaceLeft}!void { +fn setGtkEnv(config: *const CoreConfig) error{NoSpaceLeft}!void { assert(gtk.isInitialized() == 0); var gdk_debug: struct {