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

Authored by l10n daemon script <scripty@kde.org> on Jul 26 2017, 6:53 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>Jul 26 2017, 6:53 AM
Parents
R115:51057f659477: Merge branch 'Plasma/5.10'
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R115:e6663a34e620: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jul 26 2017, 6:53 AM