mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2026-10-08 01:47:25 +00:00
Fix mistake in ChangeLog from file merge
This commit is contained in:
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user