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

Authored by l10n daemon script <scripty@kde.org> on Mar 28 2017, 7:42 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 28 2017, 7:42 AM
Parents
R122:ceb988c96b04: Merge Plasma/5.9
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R122:2daabd84f4f0: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Mar 28 2017, 7:42 AM