fix incomplete merge

This commit is contained in:
Rex Dieter 2014-09-16 12:29:51 -05:00
parent df82222ccc
commit ff3a6af484

View File

@ -10,13 +10,8 @@
Summary: Qt5 - QtXmlPatterns component
Name: qt5-%{qt_module}
<<<<<<< HEAD
Version: 5.3.1
Release: 2%{?dist}
=======
Version: 5.3.2
Release: 1%{?dist}
>>>>>>> el6
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions