ab13597 15.04.1, omit conflicts with kde-i18n, kf5-ki18n

Authored and Committed by Rex Dieter 9 years ago
    15.04.1, omit conflicts with kde-i18n, kf5-ki18n
    
        
file modified
+54 -54
file modified
+7 -2
file modified
+54 -54