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

Authored by l10n daemon script <scripty@kde.org> on Nov 4 2015, 4:58 PM.

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>Nov 4 2015, 4:58 PM
Differential Revision
D2701: Process QML runtime errors
Parents
R32:580082f090f2: Merge branch '5.0'
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R32:b1a7f6d01b45: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Nov 4 2015, 4:58 PM