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

Authored by l10n daemon script <scripty@kde.org> on Jan 24 2020, 9:05 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>Jan 24 2020, 9:05 AM
Parents
R20:f4f3e9b4f8bd: set min versions
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R20:8c675a32c303: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jan 24 2020, 9:05 AM