Chris Jones 856db5f722 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>
2021-04-27 17:38:24 +01:00
..
2021-04-27 17:38:24 +01:00
2021-03-16 12:19:05 +01:00
2020-12-10 21:30:01 +01:00