kwin/effects/logout
l10n daemon script 30b516eceb 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-09-30 06:16:48 +02:00
..
package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-30 06:16:48 +02:00