Fix merge glitch in ChangeLog
This commit is contained in:
parent
f4e5b7e87d
commit
e4d3b7f860
1 changed files with 0 additions and 1 deletions
|
@ -326,7 +326,6 @@ Changes
|
|||
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
|
||||
|
||||
|
|
Loading…
Reference in a new issue