7fed1d file conflicts between kmymoney and kmymoney-doc (#859495)

Authored and Committed by rdieter 7 years ago
    file conflicts between kmymoney and kmymoney-doc (#859495)
    
        
file modified
+5 -2