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

Authored by l10n daemon script <scripty@kde.org> on Jan 16 2019, 8:09 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>Jan 16 2019, 8:09 AM
Parents
R123:37a01e1cdad6: Update version number for 5.12.7 GIT_SILENT
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R123:25e36e9043f2: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jan 16 2019, 8:09 AM