| commit | ddde34c698ad9302d024eed20c68813fbb4277fa | [log] [tgz] |
|---|---|---|
| author | Mohammad Azim Khan <Azim.Khan@arm.com> | Thu May 17 11:41:32 2018 +0100 |
| committer | Mohammad Azim Khan <Azim.Khan@arm.com> | Mon Aug 06 11:40:58 2018 +0100 |
| tree | 82933c0e956d90b72c3457155d935f1b5a5cbd48 | |
| parent | 76135345c82a87fb9e76bbdaa110f3ca441c6033 [diff] |
Remove git conflict marker from test_suite_timing.function
diff --git a/tests/suites/test_suite_timing.function b/tests/suites/test_suite_timing.function index 6e949c8..1610155 100644 --- a/tests/suites/test_suite_timing.function +++ b/tests/suites/test_suite_timing.function
@@ -53,7 +53,6 @@ * END_DEPENDENCIES */ -<<<<<<< HEAD /* BEGIN_CASE */ void timing_timer_simple( ) {