2d67e29 drop Conflicts: kio_mtp (no longer needed with renamed catalog)

Authored and Committed by Rex Dieter 9 years ago
    drop Conflicts: kio_mtp (no longer needed with renamed catalog)
    
        
file modified
+4 -4