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

Authored by l10n daemon script <scripty@kde.org> on Oct 11 2016, 10:33 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 11 2016, 10:33 AM
Parents
R14:502bdda911fc: Merge branch '3.0'
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R14:761c9c6202cb: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Oct 11 2016, 10:33 AM