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

Authored by l10n daemon script <scripty@kde.org> on Jun 5 2020, 3: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>Jun 5 2020, 3:05 AM
Parents
R1028:d7d1689e82c0: Qt 6.0 not tested yet, use 5.13 for the deprecation
Branches
Unknown
Tags
Unknown
References
HEAD -> master
l10n daemon script <scripty@kde.org> committed R1028:8eb96b0d6074: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jun 5 2020, 3:05 AM