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

Authored by l10n daemon script <scripty@kde.org> on Nov 29 2017, 8:14 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>Nov 29 2017, 8:14 AM
Parents
R320:d186f2f8b62f: GIT_SILENT Upgrade KDE Applications version to 17.11.80.
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R320:6d5346870274: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Nov 29 2017, 8:14 AM