Fix auto-merge issue in ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 9045b60dd9fec5b469602ea4d32fc1bee2da644e..05ecf0ee7b75f70aca6701b7acd2fa5e55149481 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,8 +3,6 @@
        * time/tzset.c (compute_offset): Open-code min macro.
        (min, max, sign): Remove.
 
-2017-03-07  Florian Weimer  <fweimer@redhat.com>
-
 2017-03-07  Florian Weimer  <fweimer@redhat.com>
 
        [BZ #15576]