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

Authored by l10n daemon script <scripty@kde.org> on Jan 29 2020, 8: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>Jan 29 2020, 8:27 AM
Parents
R161:02cf620a6430: KF5_MIN_VERSION for plasma 5.18 is KF5 5.66.0
Branches
Unknown
Tags
Unknown
References
tag: v5.18.0
l10n daemon script <scripty@kde.org> committed R161:398d2bbe5cf1: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jan 29 2020, 8:27 AM