summaryrefslogtreecommitdiffstats
path: root/kde5-net/keditbookmarks/CONFLICTS
blob: b63d8a9479aa61714520ecad81f8e3707cb39ad8 (plain) (blame)
1
conflicts kde-baseapps y