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

Authored by l10n daemon script <scripty@kde.org> on Nov 28 2019, 8:52 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>Nov 28 2019, 8:52 AM
Parents
R363:89cd171b911e: GIT_SILENT Upgrade KDE Applications version to 19.11.90.
Branches
Unknown
Tags
Unknown
References
tag: v19.11.90
l10n daemon script <scripty@kde.org> committed R363:c86dd429f77c: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Nov 28 2019, 8:52 AM