From ff3a6af484c59568c56deac4e6b296256a12a9bd Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Tue, 16 Sep 2014 12:29:51 -0500
Subject: [PATCH] fix incomplete merge

---
 qt5-qtxmlpatterns.spec | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/qt5-qtxmlpatterns.spec b/qt5-qtxmlpatterns.spec
index f104f2d..03f65d0 100644
--- a/qt5-qtxmlpatterns.spec
+++ b/qt5-qtxmlpatterns.spec
@@ -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