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

Authored by l10n daemon script <scripty@kde.org> on Jul 5 2018, 3:15 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 5 2018, 3:15 AM
Parents
R119:7e129489f611: Merge branch 'Plasma/5.13'
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R119:9f1d184884b9: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jul 5 2018, 3:15 AM