summaryrefslogtreecommitdiffstats
path: root/kde5-sdk/kdesvn/CONFLICTS
blob: ba2797ecd01ef0849407e44391a04479dc3ef6b2 (plain) (blame)
1
conflicts kdesvn4