[balsa/wip/gmime3: 119/197] Fix ChangeLog

[Peter Bloomfield <peterb src gnome org>]

commit 4bda49dfde317a46a3eb10346f45a51284f6d0c5
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Wed Oct 18 17:38:35 2017 -0400

    Fix ChangeLog

 ChangeLog |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6ec57d9..1f5681b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 2017-09-30  Peter Bloomfield  <pbloomfield bellsouth net>
 
        Remove unused make_gradient function, and build with