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>
This commit is contained in:
parent
ee33c60fc2
commit
856db5f722
1 changed files with 0 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue