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

Authored by l10n daemon script <scripty@kde.org> on Aug 3 2016, 12:30 PM.

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 3 2016, 12:30 PM
Parents
R34:2757986d4da1: Update KDescendantsProxyModel::setSourceModel to KF5 pre-5.25
Branches
Unknown
Tags
Unknown
References
tag: v16.07.90
l10n daemon script <scripty@kde.org> committed R34:49600e1b1483: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Aug 3 2016, 12:30 PM