- fix spec breakage

diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index b22199d21bef212829f533a352e08dcf7c28315c..84560dab9fd7bb975ad233655812a808c16640fe 100644 (file)
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -22,11 +22,7 @@ Summary:     Development tools for Qt 5
 Summary(pl.UTF-8):     Narzędzia programistyczne dla Qt 5
 Name:          qt5-%{orgname}
 Version:       5.8.0
-<<<<<<< Updated upstream
 Release:       1
-=======
-Release:       0.1
->>>>>>> Stashed changes
 License:       LGPL v2.1 with Digia Qt LGPL Exception v1.1 or GPL v3.0
 Group:         X11/Libraries
 Source0:       http://download.qt.io/official_releases/qt/5.8/%{version}/submodules/%{orgname}-opensource-src-%{version}.tar.xz