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

Authored by l10n daemon script <scripty@kde.org> on Aug 31 2017, 2:32 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>Aug 31 2017, 2:32 AM
Parents
R52:e99dd10eb9df: Merge remote-tracking branch 'origin/5.2'
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R52:713a4e2b0fc2: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Aug 31 2017, 2:32 AM