summaryrefslogblamecommitdiffstats
path: root/kde5-pim/kidentitymanagement/CONFLICTS
blob: 168f346e73a2f9fc4d2d17c2c8ad3b1b9b5028c2 (plain) (tree)
1
                               
conflicts kidentitymanagement y