Fix mistake in ChangeLog from file merge

2024-11-25 19:25:45 +01:00 · 2017-03-02 12:05:54 +00:00 · 2017-03-02 12:05:54 +00:00 · 46c8073d7b
commit 46c8073d7b
parent 8c6a2a37bb
1 changed files with 0 additions and 1 deletions
--- a/1
+++ b/1
@ -3,7 +3,6 @@ mbed TLS ChangeLog (Sorted per branch, date)
 = 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