Removing conflict trace

RoaringBitmap · Sep 29, 2023 · c438bee · c438bee
1 parent 93b5b97
commit c438bee
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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() {