kwin/effects/windowaperture/package
l10n daemon script 78c0095a5d 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-02-11 05:59:16 +01:00
..
contents/code
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-02-11 05:59:16 +01:00