From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 1 Mar 2016 05:46:29 +0000 (+0000)
Subject: cleanup
X-Git-Tag: NTP_4_2_8P7~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a338d8f485aa6879787a129cf26d62b4a09ecb61;p=thirdparty%2Fntp.git

cleanup

bk: 56d52cb5iCZ81SMke8ts2S_kDmYw2A
---

diff --git a/ChangeLog b/ChangeLog
index 7ab704f2f..230bb9668 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,7 +25,6 @@
 * [Bug 3015] ntpq: config-from-file: "request contains an unprintable character"
   - A change related to [Bug 2853] forbids trailing white space in
     remote config commands. perlinger@ntp.org
->>>>>>>
 * Document ntp.key's optional IP list in authenetic.html.  Harlan Stenn.
 * Update html/xleave.html documentation.  Harlan Stenn.
 * Update ntp.conf documentation.  Harlan Stenn.