From 1f98e64b71e883cd3d623aaba91cb6d490e3eb97 Mon Sep 17 00:00:00 2001
From: Paul Dreik <github@pauldreik.se>
Date: Wed, 7 Oct 2020 10:05:31 +0200
Subject: [PATCH] fix merge conflict on master (#1217)

---
 fuzz/build_fuzzer_variants.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/fuzz/build_fuzzer_variants.sh b/fuzz/build_fuzzer_variants.sh
index 4ae574e43..aff1e1301 100755
--- a/fuzz/build_fuzzer_variants.sh
+++ b/fuzz/build_fuzzer_variants.sh
@@ -45,12 +45,7 @@ variant=sanitizers
 	      -DCMAKE_C_FLAGS="-fsanitize=fuzzer-no-link,address,undefined -fno-sanitize-recover=undefined" \
 	      -DCMAKE_BUILD_TYPE=Debug \
 	      -DSIMDJSON_FUZZ_LINKMAIN=Off \
-<<<<<<< HEAD
 	      -DSIMDJSON_FUZZ_LDFLAGS="-fsanitize=fuzzer"
-=======
-	      -DSIMDJSON_FUZZ_LDFLAGS=$LIB_FUZZING_ENGINE \
-			  -DSIMDJSON_EXCLUDE_IMPLEMENTATION=haswell
->>>>>>> Kinder, gentler implementation selection
 	
 	ninja all_fuzzers
 	cd ..