From fd5f8bbaaea5eebec808a4db2c55c770a018558d Mon Sep 17 00:00:00 2001
From: groni <groni@pisilinux.org>
Date: Wed, 28 Dec 2016 16:21:55 +0100
Subject: [PATCH] remove confilcts from prison

---
 desktop/kde/framework/prison/pspec.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/desktop/kde/framework/prison/pspec.xml b/desktop/kde/framework/prison/pspec.xml
index 91e170ea6c..102c3cc76f 100644
--- a/desktop/kde/framework/prison/pspec.xml
+++ b/desktop/kde/framework/prison/pspec.xml
@@ -28,13 +28,7 @@
             <Dependency>libgcc</Dependency>            
             <Dependency>libdmtx</Dependency>
             <Dependency>qrencode</Dependency>
-        </RuntimeDependencies>
-        <Replaces>
-          <Package>prison-qt5</Package>
-        </Replaces>
-        <Conflicts>
-          <Package>prison-qt5</Package>
-        </Conflicts>
+        </RuntimeDependencies>        
         <Files>
             <Path fileType="library">/usr/lib</Path>
             <Path fileType="library">/usr/lib/qt5</Path>