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

Authored by l10n daemon script <scripty@kde.org> on Mar 27 2020, 5:24 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>Mar 27 2020, 5:24 AM
Parents
R242:2e017f501aad: GIT_SILENT increase KF_DISABLE_DEPRECATED_BEFORE_AND_AT
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R242:f6bb0229b04e: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Mar 27 2020, 5:24 AM