Fix mistake in ChangeLog from file merge

This commit is contained in:
Simon Butcher 2017-03-02 12:05:54 +00:00
parent 04965edaa8
commit 28d9fe031d

View File

@ -3,7 +3,6 @@ mbed TLS ChangeLog (Sorted per branch, date)
= mbed TLS x.x.x branch released xxxx-xx-xx = mbed TLS x.x.x branch released xxxx-xx-xx
Bugfix Bugfix
<<<<<<< HEAD
* Fix the redefinition of macro ssl_set_bio to an undefined symbol * Fix the redefinition of macro ssl_set_bio to an undefined symbol
mbedtls_ssl_set_bio_timeout in compat-1.3.h, by removing it. mbedtls_ssl_set_bio_timeout in compat-1.3.h, by removing it.
Found by omlib-lin. #673 Found by omlib-lin. #673