scriptoriumadmin/GitNexus
1
0
Fork 0
mirror of https://github.com/abhigyanpatwari/GitNexus.git synced 2026-10-11 03:38:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix(zig): resolve leftover fixture merge markers (Page.zig)

Browse source
This commit is contained in:
Navid EMAD 2026-08-18 14:58:45 +02:00
parent bb51ca342c
commit 2f4c88fbf6
No known key found for this signature in database
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gitnexus/test/fixtures/lang-resolution/zig-filestruct/src/Page.zig vendored
View file

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