kwin/kcmkwin/kwindecoration/package
l10n daemon script 10e0b28626 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"
2019-02-25 05:52:34 +01:00
..
contents/ui
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-02-25 05:52:34 +01:00