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

Authored by l10n daemon script <scripty@kde.org> on Oct 31 2017, 3:42 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>Oct 31 2017, 3:42 AM
Parents
R119:357bb3ab75c9: It's autotests not tests
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R119:0ff287e0541a: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Oct 31 2017, 3:42 AM