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

Authored by l10n daemon script <scripty@kde.org> on Jul 7 2018, 5:22 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 7 2018, 5:22 AM
Parents
R119:e1252c6e40ac: Fix crash on post-initial refresh()
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R119:a6d4cab8f547: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jul 7 2018, 5:22 AM