From 28d9fe031dcd74646b5987e4407ec6108bcba3d3 Mon Sep 17 00:00:00 2001
From: Simon Butcher <simon.butcher@arm.com>
Date: Thu, 2 Mar 2017 12:05:54 +0000
Subject: [PATCH] Fix mistake in ChangeLog from file merge

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

diff --git a/ChangeLog b/ChangeLog
index 01bdb22d4..88e2bc92b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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