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

Authored by l10n daemon script <scripty@kde.org> on Mar 23 2019, 5:16 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 23 2019, 5:16 AM
Parents
R119:34387d450ab2: [Desktop Theme KCM] "Normalize" margin around background in previews
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R119:2760c91ab1cd: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Mar 23 2019, 5:16 AM