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

Authored by l10n daemon script <scripty@kde.org> on Mar 11 2018, 6:13 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 11 2018, 6:13 AM
Parents
R487:4ad3458085c5: Merge branch 'Plasma/5.11'
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R487:02c5a8851838: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Mar 11 2018, 6:13 AM