oops - resolve conflicts

This commit is contained in:
Ondřej Vašík 2013-03-18 09:06:36 +01:00
commit a4c9ff6196

View File

@ -1,6 +1,8 @@
Name: docbook5-style-xsl
Version: 1.78.1
Release: 1%{?dist}
Version: 1.78.0
Release: 3%{?dist}
Group: Applications/Text
Summary: Norman Walsh's XSL stylesheets for DocBook 5.X
@ -88,6 +90,9 @@ fi
* Mon Mar 18 2013 Ondrej Vasik <ovasik@redhat.com> 1.78.1-1
- new upstream release 1.78.1
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.78.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Thu Jan 03 2013 Ondrej Vasik <ovasik@redhat.com> 1.78.0-2
- resolve missing VERSION.xsl (#891459)