From e4d3b7f86074e32d907867d72ee52507b47b3457 Mon Sep 17 00:00:00 2001
From: Gilles Peskine <Gilles.Peskine@arm.com>
Date: Wed, 4 Apr 2018 09:28:48 +0200
Subject: [PATCH] Fix merge glitch in ChangeLog

---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 70e9bb679..b772c3fd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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