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

Authored by l10n daemon script <scripty@kde.org> on Jun 24 2018, 3:32 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>Jun 24 2018, 3:32 AM
Parents
R120:b296b92036bd: Fix-up last merge, remove slipped back X-KDE-DBus-ModuleName
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R120:afa07967449b: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jun 24 2018, 3:32 AM