From c438beee825ecc6b2d5fb668d4bc0156cc498fee Mon Sep 17 00:00:00 2001
From: Daniel Lemire <daniel@lemire.me>
Date: Fri, 29 Sep 2023 10:15:51 -0400
Subject: [PATCH] Removing conflict trace

---
 tests/toplevel_unit.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/toplevel_unit.c b/tests/toplevel_unit.c
index e7bfda061..ebbf47ffe 100644
--- a/tests/toplevel_unit.c
+++ b/tests/toplevel_unit.c
@@ -4642,7 +4642,6 @@ DEFINE_TEST(robust_deserialization) {
     // contains a run container that overflows the 16-bit boundary.
     const char test1[] = "\x3b\x30\x00\x00\x01\x00\x00\xfa\x2e\x01\x00\x00\x02\xff\xff";
     assert_true(deserialization_test(test1, sizeof(test1)));
->>>>>>> master
 }
 
 int main() {