Mbed-TLS/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-09-16 15:19:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove git conflict marker from test_suite_timing.function

Browse Source
This commit is contained in:
Mohammad Azim Khan
2018-08-06 11:40:58 +01:00
parent 76135345c8
commit ddde34c698
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/suites/test_suite_timing.function
-1
View File
@@ -53,7 +53,6 @@ static int timers_are_badly_broken = 0;
* END_DEPENDENCIES
*/
<<<<<<< HEAD
/* BEGIN_CASE */
void timing_timer_simple( )
{