Resolve merge conflicts
This commit is contained in:
commit
762ebf2dc6
@ -1,6 +1,6 @@
|
||||
Name: docbook5-style-xsl
|
||||
Version: 1.78.1
|
||||
Release: 2%{?dist}
|
||||
Release: 4%{?dist}
|
||||
Group: Applications/Text
|
||||
|
||||
Summary: Norman Walsh's XSL stylesheets for DocBook 5.X
|
||||
@ -99,9 +99,15 @@ if [ "$1" = 0 ]; then
|
||||
fi
|
||||
|
||||
%changelog
|
||||
* Wed Jul 16 2014 Ondrej Vasik <ovasik@redhat.com> 1.78.1-2
|
||||
* Wed Jul 16 2014 Ondrej Vasik <ovasik@redhat.com> 1.78.1-4
|
||||
- include extensions in extensions subpackage (#1084491)
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.78.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.78.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Mon Mar 18 2013 Ondrej Vasik <ovasik@redhat.com> 1.78.1-1
|
||||
- new upstream release 1.78.1
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user