From 596d547f50c4307e2cfd87818b8bd7c95c81d61c Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 7 Mar 2017 17:47:17 +0100 Subject: Fix auto-merge issue in ChangeLog --- ChangeLog | 2 -- 1 file changed, 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9045b60dd9..05ecf0ee7b 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 - 2017-03-07 Florian Weimer [BZ #15576] -- cgit v1.2.1