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

Authored by l10n daemon script <scripty@kde.org> on Dec 28 2016, 4:55 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>Dec 28 2016, 4:55 AM
Parents
R14:362b144caf8f: Address T4491 making KReportDpi a private non-exported class
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R14:20147412b2f4: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Dec 28 2016, 4:55 AM