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

Authored by l10n daemon script <scripty@kde.org> on Jan 13 2020, 8:36 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>Jan 13 2020, 8:36 AM
Parents
R471:778bae9eeef6: In case WebKit is disabled, do not add a webkit supported online quote
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R471:676b61063e23: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jan 13 2020, 8:36 AM