Remove git conflict marker from test_suite_timing.function

2018-05-17 11:41:32 +01:00 · 2018-05-17 11:41:32 +01:00 · ddde34c698
commit ddde34c698
parent 76135345c8
1 changed files with 0 additions and 1 deletions
--- 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( )
 {