| commit | f1aaec9888bfb341f2f80fdf136d108e6887a256 | [log] [tgz] |
|---|---|---|
| author | Azim Khan <Azim.Khan@arm.com> | Tue May 30 14:23:15 2017 +0100 |
| committer | Mohammad Azim Khan <Azim.Khan@arm.com> | Mon Aug 06 11:40:57 2018 +0100 |
| tree | 8a49562bd75314df3412efa9c7efbf08d4a0e857 | |
| parent | 9079170f6e71cd4b3e6822ee472ecad06b272f32 [diff] [blame] |
Intermediate hexify out change
diff --git a/tests/suites/test_suite_timing.function b/tests/suites/test_suite_timing.function index 1610155..6e949c8 100644 --- a/tests/suites/test_suite_timing.function +++ b/tests/suites/test_suite_timing.function
@@ -53,6 +53,7 @@ * END_DEPENDENCIES */ +<<<<<<< HEAD /* BEGIN_CASE */ void timing_timer_simple( ) {