Typo cleanup

bk: 4aaf471f0ASIKRi0ZU4vxqBhExttAw

diff --git a/ChangeLog b/ChangeLog
index 9badbd4a13c812c82cd5eb628c8fb5b8ea012d77..e5d1e27190afcca59bd1bb4030648cbb575a2170 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,3 @@
-* Documentation updates from Dave Mills.
 * [Bug 983] add interface [listen | ignore | drop] ... directive.
 * [Bug 1243] MD5auth_setkey zero-fills key from first zero octet.
 * [Bug 1295] leftover fix, do not crash on exit in free_config_trap()
@@ -9,8 +8,8 @@
 * CID 79: kod_init_kod_db() fails to fclose(db_s) in two error paths.
 * CID 80: attempt to quiet Coverity false positive re: leaking "reason"
   in main().
+* Documentation updates from Dave Mills.
 * CID 81: savedconfig leaked in save_config().
->>>>>>>
 * Make the code agree with the spec and the book (Dave Mills).
 (4.2.5p211) 2009/09/14 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 663] respect ntpq -c and -p order on command line.