Conflict cleanup

This commit is contained in:
Petr Šabata 2015-06-23 11:29:13 +02:00
commit 2e9339c4fe

View File

@ -95,6 +95,9 @@ make test
* Tue Jun 23 2015 Petr Šabata <contyk@redhat.com> - 1.92-1 * Tue Jun 23 2015 Petr Šabata <contyk@redhat.com> - 1.92-1
- 1.92 bump - 1.92 bump
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.91-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Mon Jun 15 2015 Petr Šabata <contyk@redhat.com> - 1.91-1 * Mon Jun 15 2015 Petr Šabata <contyk@redhat.com> - 1.91-1
- 1,91 bump, tzdata updated - 1,91 bump, tzdata updated