From: Juergen Perlinger Date: Fri, 5 Jul 2019 06:31:58 +0000 (+0200) Subject: changelog clash X-Git-Tag: NTP_4_3_106~10^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73f096caadfaa03f9acd4ce749630f27b8d256af;p=thirdparty%2Fntp.git changelog clash bk: 5d1eeedek1jRD10LgqL9-RtVdGZ8pA --- diff --git a/ChangeLog b/ChangeLog index 54dc3b492..4cce4a14c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,3 @@ ---- * [Bug 3432] refclocks that 'write()' should check the result - plus some more work on warnings for unchecked results