| commit | 856db5f722048012dfc165d285a3c88a6bc79496 | [log] [tgz] |
|---|---|---|
| author | Chris Jones <christopher.jones@arm.com> | Thu Dec 17 12:09:14 2020 +0000 |
| committer | Chris Jones <christopher.jones@arm.com> | Tue Apr 27 17:38:24 2021 +0100 |
| tree | 41a06f0ef8db0cea24836f15c9ff944b622e0847 | |
| parent | ee33c60fc28c4872fdabf3fab3ebb006f3fc07e3 [diff] |
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 <christopher.jones@arm.com>
diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index 0bb9b04..b3f1415 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh
@@ -2410,7 +2410,6 @@ make test } -<<<<<<< HEAD component_test_no_strings () { msg "build: no strings" # ~10s scripts/config.py full