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

Authored by l10n daemon script <scripty@kde.org> on Nov 28 2019, 4:59 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>Nov 28 2019, 4:59 AM
Parents
R99:4090e899eddd: Add default value for cursor theme
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R99:8808df330183: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Nov 28 2019, 4:59 AM