| commit | 6f486a6fb5c7311a8d07913778b53f128ec37cd8 | [log] [tgz] |
|---|---|---|
| author | Hanno Becker <hanno.becker@arm.com> | Thu Mar 08 13:31:44 2018 +0000 |
| committer | Hanno Becker <hanno.becker@arm.com> | Thu Mar 08 13:31:44 2018 +0000 |
| tree | 4472749ac3f7870f38ff40e9d30b4d16731596c2 | |
| parent | a3389ebb0970dba5cb08ade8c5d83b1bef7d7db8 [diff] |
Fix merge error
diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index 140a90f..e60530f 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh
@@ -881,8 +881,5 @@ msg "Done, cleaning up" cleanup -<<<<<<< HEAD -======= final_report ->>>>>>> development-restricted