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

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