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

Authored by l10n daemon script <scripty@kde.org> on Feb 28 2017, 11:58 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>Feb 28 2017, 11:58 AM
Parents
R114:d91b43268939: Quicklaunch: Don't use plasma theme for icons
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R114:1542ec4a051f: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Feb 28 2017, 11:58 AM