changelog clash

bk: 5d1eeedek1jRD10LgqL9-RtVdGZ8pA

diff --git a/ChangeLog b/ChangeLog
index 54dc3b492c9760a2d6aec5841f3245961f054846..4cce4a14c373a362b30c36cabd30d6902b4eaeba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,3 @@
----
 * [Bug 3432] refclocks that 'write()' should check the result <perlinger@ntp.org>
   - plus some more work on warnings for unchecked results