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

Authored by l10n daemon script <scripty@kde.org> on May 10 2020, 4:10 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>May 10 2020, 4:10 AM
Parents
R266:2ec577bd9131: GIT_SILENT Upgrade KF5 version to 5.71.0.
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R266:8f5198639c72: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).May 10 2020, 4:10 AM