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

Authored by l10n daemon script <scripty@kde.org> on Sep 16 2018, 3:45 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>Sep 16 2018, 3:45 AM
Parents
R120:36daf5fb866b: Revert " Revert "Update version number for 5.14.80""
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R120:9c8a9d677cde: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Sep 16 2018, 3:45 AM