yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-01-23 22:11:09 +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-05-17 11:41:32 +01:00
parent 76135345c8
commit ddde34c698
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tests/suites/test_suite_timing.function
View file

@ -53,7 +53,6 @@ static int timers_are_badly_broken = 0;
* END_DEPENDENCIES * END_DEPENDENCIES
*/ */
<<<<<<< HEAD
/* BEGIN_CASE */ /* BEGIN_CASE */
void timing_timer_simple( ) void timing_timer_simple( )
{ {