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

Authored by l10n daemon script <scripty@kde.org> on May 28 2018, 3:36 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 28 2018, 3:36 AM
Parents
R114:544442dfcf1e: Merge branch 'Plasma/5.13'
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R114:056747e27be5: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).May 28 2018, 3:36 AM