From ddde34c698ad9302d024eed20c68813fbb4277fa Mon Sep 17 00:00:00 2001
From: Mohammad Azim Khan <Azim.Khan@arm.com>
Date: Thu, 17 May 2018 11:41:32 +0100
Subject: [PATCH] Remove git conflict marker from test_suite_timing.function

---
 tests/suites/test_suite_timing.function | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/suites/test_suite_timing.function b/tests/suites/test_suite_timing.function
index 6e949c86b..1610155fb 100644
--- a/tests/suites/test_suite_timing.function
+++ b/tests/suites/test_suite_timing.function
@@ -53,7 +53,6 @@ static int timers_are_badly_broken = 0;
  * END_DEPENDENCIES
  */
 
-<<<<<<< HEAD
 /* BEGIN_CASE */
 void timing_timer_simple( )
 {