From 6f486a6fb5c7311a8d07913778b53f128ec37cd8 Mon Sep 17 00:00:00 2001
From: Hanno Becker <hanno.becker@arm.com>
Date: Thu, 8 Mar 2018 13:31:44 +0000
Subject: [PATCH] Fix merge error

---
 tests/scripts/all.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 140a90f09..e60530fd7 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -881,8 +881,5 @@ rm -rf "$OUT_OF_SOURCE_DIR"
 
 msg "Done, cleaning up"
 cleanup
-<<<<<<< HEAD
-=======
 
 final_report
->>>>>>> development-restricted