| commit | 28d9fe031dcd74646b5987e4407ec6108bcba3d3 | [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:05:54 2017 +0000 |
| tree | 0c601011cd2796294b3ef65d8ff746fc3b002aa1 | |
| parent | 04965edaa883b7c77ebc7917761195d6895a2e12 [diff] |
Fix mistake in ChangeLog from file merge
diff --git a/ChangeLog b/ChangeLog index 01bdb22..88e2bc9 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