From 2f4c88fbf6b3642b55a5d5df509763adac7a4f7b Mon Sep 17 00:00:00 2001 From: Navid EMAD Date: Tue, 18 Aug 2026 14:58:45 +0200 Subject: [PATCH] fix(zig): resolve leftover fixture merge markers (Page.zig) --- .../fixtures/lang-resolution/zig-filestruct/src/Page.zig | 6 ------ 1 file changed, 6 deletions(-) diff --git a/gitnexus/test/fixtures/lang-resolution/zig-filestruct/src/Page.zig b/gitnexus/test/fixtures/lang-resolution/zig-filestruct/src/Page.zig index 546ab667c..2f55882ee 100644 --- a/gitnexus/test/fixtures/lang-resolution/zig-filestruct/src/Page.zig +++ b/gitnexus/test/fixtures/lang-resolution/zig-filestruct/src/Page.zig @@ -21,7 +21,6 @@ pub fn bump(self: *Page) void { self.count += 1; _ = self.getArena(); } -<<<<<<< HEAD // Field-typed receivers (F5): `session: *Session` types the member, so a // call through it dispatches into Session.zig — directly (`self.session.name()`) @@ -35,9 +34,6 @@ pub fn sessionLabel(self: *Page) []const u8 { return s.name(); } -||||||| parent of fb83c9d9 (fix(zig): type locals through try/catch/orelse, return types and payload captures) - -======= // F6 — value flow: a fallible constructor, member calls whose RETURN types // type the local, optionals for `if` / `while` payloads. @@ -53,5 +49,3 @@ pub fn getSession(self: *Page) *Session { pub fn maybeSession(self: *Page) ?*Session { return self.session; } - ->>>>>>> fb83c9d9 (fix(zig): type locals through try/catch/orelse, return types and payload captures) \ No newline at end of file