cleanup

bk: 56d52cb5iCZ81SMke8ts2S_kDmYw2A

diff --git a/ChangeLog b/ChangeLog
index 7ab704f2f157d006c8186989e04a46b02e8ea431..230bb9668b7f278658860d444dd380412998e0f0 100644 (file)
--- 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.