diff options
author | Florian Weimer <fweimer@redhat.com> | 2017-03-07 17:47:17 +0100 |
---|---|---|
committer | Florian Weimer <fweimer@redhat.com> | 2017-03-07 17:47:17 +0100 |
commit | 596d547f50c4307e2cfd87818b8bd7c95c81d61c (patch) | |
tree | e29bae180fbb9010c56c66b2c895a14c8bde224b | |
parent | 6e3b52292a042ede4d053054a895167afd6edcf2 (diff) | |
download | glibc-596d547f50c4307e2cfd87818b8bd7c95c81d61c.tar glibc-596d547f50c4307e2cfd87818b8bd7c95c81d61c.tar.gz glibc-596d547f50c4307e2cfd87818b8bd7c95c81d61c.tar.bz2 glibc-596d547f50c4307e2cfd87818b8bd7c95c81d61c.zip |
Fix auto-merge issue in ChangeLog
-rw-r--r-- | ChangeLog | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -5,8 +5,6 @@ 2017-03-07 Florian Weimer <fweimer@redhat.com> -2017-03-07 Florian Weimer <fweimer@redhat.com> - [BZ #15576] Remove TZNAME_MAX limit from sysconf. * include/time.h (__tzname_cur_max, __tzname_max): Remove |