From e4b89450f90085c1b44bd9bab0477c7b136c7f63 Mon Sep 17 00:00:00 2001
From: Simon Butcher <simon.butcher@arm.com>
Date: Thu, 2 Feb 2017 16:36:59 +0000
Subject: [PATCH] Add credit to Changelog for #562

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

diff --git a/ChangeLog b/ChangeLog
index 9ec6f25d8..129a20297 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,7 +20,6 @@ Security
      Reported independently by rongsaws and Regina Wilson. #569 CVE-2017-2784
 
 Bugfix
-<<<<<<< HEAD
    * Fix output certificate verification flags set by x509_crt_verify_top() when
      traversing a chain of trusted CA. The issue would cause both flags,
      MBEDTLS_X509_BADCERT_NOT_TRUSTED and MBEDTLS_X509_BADCERT_EXPIRED, to be