fix

zig-bitcoin · Oct 3, 2024 · bb2a8a7 · bb2a8a7
1 parent ec9344f
commit bb2a8a7
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/src/network/protocol/messages/lib.zig b/src/network/protocol/messages/lib.zig
@@ -160,12 +160,9 @@ pub const Message = union(MessageTypes) {
             .notfound => |*m| m.checksum(),
             .sendheaders => |*m| m.checksum(),
             .filterload => |*m| m.checksum(),
-<<<<<<< HEAD
             .addr => |*m| m.checksum(),
-=======
             .headers => |*m| m.checksum(),
             .cmpctblock => |*m| m.checksum(),
->>>>>>> origin/main
         };
     }
 
@@ -187,12 +184,9 @@ pub const Message = union(MessageTypes) {
             .notfound => |m| m.hintSerializedLen(),
             .sendheaders => |m| m.hintSerializedLen(),
             .filterload => |*m| m.hintSerializedLen(),
-<<<<<<< HEAD
             .addr => |*m| m.hintSerializedLen(),
-=======
             .headers => |*m| m.hintSerializedLen(),
             .cmpctblock => |*m| m.hintSerializedLen(),
->>>>>>> origin/main
         };
     }
 };