| commit | e4d3b7f86074e32d907867d72ee52507b47b3457 | [log] [tgz] |
|---|---|---|
| author | Gilles Peskine <Gilles.Peskine@arm.com> | Wed Apr 04 09:28:48 2018 +0200 |
| committer | Gilles Peskine <Gilles.Peskine@arm.com> | Wed Apr 04 09:28:48 2018 +0200 |
| tree | 2bbe48627dc795adc529c1ba9b101b12fa86557b | |
| parent | f4e5b7e87de2484f0e3dbb9d11e87dd275874cd0 [diff] |
Fix merge glitch in ChangeLog
diff --git a/ChangeLog b/ChangeLog index 70e9bb6..b772c3f 100644 --- a/ChangeLog +++ b/ChangeLog
@@ -326,7 +326,6 @@ implementation. * Add explicit warnings for the use of MD2, MD4, MD5, SHA-1, DES and ARC4 throughout the library. ->>>>>>> development = mbed TLS 2.6.0 branch released 2017-08-10