From 2b8d89009895f0e2bb5cf1accb05822b56fa5396 Mon Sep 17 00:00:00 2001
From: Simon Butcher <simon.butcher@arm.com>
Date: Thu, 2 Feb 2017 13:08:37 +0000
Subject: [PATCH] Clarify fix for #673 in Changelog

Clarified fix, and added credit.
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index bb15ee2ab..e40589e36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,7 @@ 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