SVN_SILENT made messages (.desktop file) - always resolve ours

Authored by l10n daemon script <scripty@kde.org> on Nov 2 2019, 8:33 AM.

Description

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"

Details

Committed
l10n daemon script <scripty@kde.org>Nov 2 2019, 8:33 AM
Parents
R120:9dca7d6cd44c: [wallpapers/image] Randomise new batches of images in the slideshow
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R120:9eba031fbbe0: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Nov 2 2019, 8:33 AM