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

Authored by l10n daemon script <scripty@kde.org> on Aug 21 2017, 4:45 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 21 2017, 4:45 AM
Parents
R33:fb704c7745b5: Set version number to 5.1.2
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R33:70997d85c7fb: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Aug 21 2017, 4:45 AM