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

Authored by l10n daemon script <scripty@kde.org> on Feb 24 2019, 4:27 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 24 2019, 4:27 AM
Parents
R53:9eb8dd8d7ae1: Adapt to KDevelop API changes
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R53:a3fbce93650e: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Feb 24 2019, 4:27 AM