Fix merge glitch in ChangeLog

2026-05-09 11:14:26 +02:00 · 2018-04-04 09:28:48 +02:00
parent f4e5b7e87d
commit e4d3b7f860
1 changed files with 0 additions and 1 deletions
--- a/1
+++ b/1
@@ -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