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

Authored by l10n daemon script <scripty@kde.org> on Jul 24 2017, 2:34 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>Jul 24 2017, 2:34 AM
Parents
R14:d4af3605e666: Clean up KReportUnit
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R14:03d2b8466454: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jul 24 2017, 2:34 AM