Cleanup

bk: 5c4001b4_iPfSlNqJvxKSExwlQ23GQ

diff --git a/ChangeLog b/ChangeLog
index e342adf2a47bd938d3d67c7edea9c8bb61928889..44f36ea4d0b94bed622cf381787b20d5ef4fdd39 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,7 +38,6 @@
   - added missing check, reported by Reinhard Max <perlinger@ntp.org>
 * [Bug 1674] runtime crashes and sync problems affecting both x86 and x86_64
   - this is a variant of [bug 3558] and should be fixed with it
->>>>>>>
 
 ---
 (4.2.8p12) 2018/08/14 Released by Harlan Stenn <stenn@ntp.org>