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

Authored by l10n daemon script <scripty@kde.org> on Aug 4 2018, 3:43 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>Aug 4 2018, 3:43 AM
Parents
R223:5f93a0b90ee2: GIT_SILENT made messages (after extraction)
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R223:f1d3c68115f2: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Aug 4 2018, 3:43 AM