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

Authored by l10n daemon script <scripty@kde.org> on Nov 4 2018, 5:02 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>Nov 4 2018, 5:02 AM
Parents
R224:0b72150ed83f: Add support for sharing text via qml
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R224:8d831d018b45: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Nov 4 2018, 5:02 AM