From 856db5f722048012dfc165d285a3c88a6bc79496 Mon Sep 17 00:00:00 2001 From: Chris Jones Date: Thu, 17 Dec 2020 12:09:14 +0000 Subject: [PATCH] Remove merge conflict marker Remove a merge conflict marker that was missed in `all.sh` and was causing building to fail. Signed-off-by: Chris Jones --- tests/scripts/all.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index 0bb9b0446c..b3f1415315 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -2410,7 +2410,6 @@ component_test_no_64bit_multiplication () { make test } -<<<<<<< HEAD component_test_no_strings () { msg "build: no strings" # ~10s scripts/config.py full