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

Authored by l10n daemon script <scripty@kde.org> on Mar 25 2019, 7:56 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>Mar 25 2019, 7:56 AM
Parents
R166:9ffc57b2957c: Change i18n of filename formatting options
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R166:d023ae5efa23: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Mar 25 2019, 7:56 AM