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

Authored by l10n daemon script <scripty@kde.org> on Jan 27 2019, 4:41 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>Jan 27 2019, 4:41 AM
Parents
R120:8fbc8edd46d4: Merge branch 'Plasma/5.15'
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R120:dc58b8df415e: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jan 27 2019, 4:41 AM