From 7d88f1e3e683462f18b2451a2a46fc20590159bd Mon Sep 17 00:00:00 2001
From: Daniel Lemire <daniel@lemire.me>
Date: Mon, 7 Oct 2024 18:19:47 -0400
Subject: [PATCH] Update croaring_fuzzer.c

---
 fuzz/croaring_fuzzer.c | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/fuzz/croaring_fuzzer.c b/fuzz/croaring_fuzzer.c
index c1e7eb9b..8f65ac51 100644
--- a/fuzz/croaring_fuzzer.c
+++ b/fuzz/croaring_fuzzer.c
@@ -78,7 +78,6 @@ int bitmap64(const char *data, size_t size) {
     }
     return 0;
 }
-<<<<<<< HEAD
 
 int LLVMFuzzerTestOneInput(const char *data, size_t size) {
     if (size == 0) {
@@ -89,17 +88,4 @@ int LLVMFuzzerTestOneInput(const char *data, size_t size) {
     } else {
         return bitmap64(data + 1, size - 1);
     }
-=======
-int LLVMFuzzerTestOneInput(const char *data, size_t size) {
-    int r;
-    r = bitmap32(data, size);
-    if (r) {
-        return r;
-    }
-    r = bitmap64(data, size);
-    if (r) {
-        return r;
-    }
-    return 0;
->>>>>>> 345433598c21c4e35f817a0cc01d023c949961d1
 }