| commit | 46c8073d7b73f30bbe059aa253aa8c4f74a8172a | [log] [tgz] |
|---|---|---|
| author | Simon Butcher <simon.butcher@arm.com> | Thu Mar 02 12:05:54 2017 +0000 |
| committer | Simon Butcher <simon.butcher@arm.com> | Thu Mar 02 12:06:53 2017 +0000 |
| tree | 5763c71259e55914f1569b14a218c212d3a879f6 | |
| parent | 8c6a2a37bbe7fb3c2080270df7e1551be4a841d7 [diff] |
Fix mistake in ChangeLog from file merge
diff --git a/ChangeLog b/ChangeLog index 4eee33d..8b1fafb 100644 --- a/ChangeLog +++ b/ChangeLog
@@ -3,7 +3,6 @@ = mbed TLS x.x.x branch released xxxx-xx-xx Bugfix -<<<<<<< HEAD * 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. Found by omlib-lin. #673