[docbook5-style-xsl: 2/2] oops - resolve conflicts

[Ondrej Vasik]

commit a4c9ff619679c28267bb2e090a03cf8a24eeee9c
Merge: 1276db5 8b4e116
Author: Ondřej Vašík <ovasik at redhat.com>
Date:   Mon Mar 18 09:06:36 2013 +0100

    oops - resolve conflicts

 docbook5-style-xsl.spec |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --cc docbook5-style-xsl.spec
index 954a8aa,9870b99..64c7ae5
--- a/docbook5-style-xsl.spec
+++ b/docbook5-style-xsl.spec
@@@ -1,6 -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
@@@ -85,9 -85,9 +87,12 @@@ if [ "$1" = 0 ]; the
  fi
  
  %changelog
 +* Mon Mar 18 2013 Ondrej Vasik <ovasik at redhat.com> 1.78.1-1
 +- new upstream release 1.78.1
 +
+ * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.78.0-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
  * Thu Jan 03 2013 Ondrej Vasik <ovasik at redhat.com> 1.78.0-2
  - resolve missing VERSION.xsl (#891459)