Merge pull request #2468 from groni/master

remove confilcts from prison
2016-12-28 16:22:44 +01:00
parent fd81548309 fd5f8bbaae
commit 9142a475ec
1 changed files with 1 additions and 7 deletions
@@ -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>