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

Authored by l10n daemon script <scripty@kde.org> on Sep 11 2019, 5: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>Sep 11 2019, 5:33 AM
Parents
rLIBKLEO45e6a3a91aad: GIT_SILENT: Minor qstring optimization, use QLatin1Char when possible
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed rLIBKLEO9b202ae1d162: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Sep 11 2019, 5:33 AM