summaryrefslogblamecommitdiffstats
path: root/kde5-sdk/kdevelop/CONFLICTS
blob: 2d7e986842e6bb69c28b9ed39e20c1c5fcc8f6a3 (plain) (tree)
1
                        
conflicts kdevplatform y