kwin/kcmkwin/kwinrules/package
l10n daemon script c10fe06d06 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-06-18 05:44:57 +02:00
..
contents/ui Merge branch 'Plasma/5.19' 2020-06-12 16:58:09 +02:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 05:44:57 +02:00