From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 17 Jan 2019 04:16:52 +0000 (+0000)
Subject: Cleanup
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be6fbd682e3bb2afc452e9cf87e85feb9873d8c4;p=thirdparty%2Fntp.git

Cleanup

bk: 5c4001b4_iPfSlNqJvxKSExwlQ23GQ
---

diff --git a/ChangeLog b/ChangeLog
index e342adf2a..44f36ea4d 100644
--- 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>