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

Authored by l10n daemon script <scripty@kde.org> on May 16 2017, 2:21 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>May 16 2017, 2:21 AM
Parents
R14:02a8504172eb: Merge branch '3.0'
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R14:7578bfce2d66: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).May 16 2017, 2:21 AM