From: Florian Weimer <fweimer@redhat.com>
Date: Tue, 7 Mar 2017 16:47:17 +0000 (+0100)
Subject: Fix auto-merge issue in ChangeLog
X-Git-Tag: glibc-2.26~736
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=596d547f50c4307e2cfd87818b8bd7c95c81d61c;p=thirdparty%2Fglibc.git

Fix auto-merge issue in ChangeLog
---

diff --git a/ChangeLog b/ChangeLog
index 9045b60dd9f..05ecf0ee7b7 100644
--- 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]