From bb8bb6a15e83dc2b0a33133c8d738de2594d4f58 Mon Sep 17 00:00:00 2001 From: Lucas Faria Mendes Date: Fri, 5 Dec 2025 10:49:15 -0300 Subject: idk2 --- src/schema.zig | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/schema.zig b/src/schema.zig index 1244516..54a0049 100644 --- a/src/schema.zig +++ b/src/schema.zig @@ -2,7 +2,6 @@ const std = @import("std"); const varint = @import("varint.zig"); const record = @import("record.zig"); -<<<<<<< HEAD fn getIndexRootpage(allocator: std.mem.Allocator, file: *std.fs.File, page_size: u16, table_name: []const u8, column_name: []const u8) !?u32 { var buf: [2]u8 = undefined; _ = try file.seekTo(103); @@ -487,8 +486,6 @@ fn traverseBTree(allocator: std.mem.Allocator, file: *std.fs.File, page_size: u1 } } -======= ->>>>>>> parent of cba3ef1 (codecrafters submit [skip ci]) pub fn getRootpage(allocator: std.mem.Allocator, file: *std.fs.File, page_size: u16, table_name: []const u8) !u32 { var buf: [2]u8 = undefined; _ = try file.seekTo(103); -- cgit v1.2.3