kwin/effects/dimscreen
l10n daemon script e15004ff98 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-07-28 06:11:46 +02:00
..
package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-07-28 06:11:46 +02:00