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

Authored by l10n daemon script <scripty@kde.org> on Oct 4 2017, 6:47 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>Oct 4 2017, 6:47 AM
Parents
R39:af3e9946fc0f: Fix the fall-back "blackness" value for unicode > 255 characters.
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R39:0edc06d13c5f: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Oct 4 2017, 6:47 AM