de2b61a Fix file conflicts with kde-l10n

Authored and Committed by Kevin Kofler 9 years ago
    Fix file conflicts with kde-l10n
    
    * Tue Feb 10 2015 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.0.2-4
    - Fix file conflicts with kde-l10n
    
        
file modified
+12 -1