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

Authored by l10n daemon script <scripty@kde.org> on Jun 6 2020, 3:01 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>Jun 6 2020, 3:01 AM
Parents
R1032:344ecc9f011a: Add support for the Hafas extension parameter
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R1032:7f786ba517ac: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jun 6 2020, 3:01 AM