From ac755bff62e56b5bba95828174e4a2b121323bea Mon Sep 17 00:00:00 2001
From: Marcin Krol <hawk@tld-linux.org>
Date: Wed, 24 Jan 2018 15:33:52 +0000
Subject: [PATCH] - fix spec breakage

---
 qt5-qttools.spec | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index b22199d..84560da 100644
--- 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
-- 
2.44.0