fix merge conflict on master (simdjson#1217)

pauldreik · web-flow · commit 1f98e64b71e8 · 2020-10-07T10:05:31.000+02:00
diff --git 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 ..
