f37fd94 omit conflicts with kde-apps-17.12.x (#1535288)

Authored and Committed by rdieter 6 years ago
1 file changed. 22 lines added. 43 lines removed.
    omit conflicts with kde-apps-17.12.x (#1535288)
    
        
file modified
+22 -43