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

Authored by l10n daemon script <scripty@kde.org> on Aug 6 2017, 2: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>Aug 6 2017, 2:42 AM
Parents
R33:2e31f77f827f: Fix KLineEdit->QLineEdit port: showClearButton is now clearButtonEnabled
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R33:0c9fdaadeb50: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Aug 6 2017, 2:42 AM