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

Authored by l10n daemon script <scripty@kde.org> on Aug 5 2019, 2:45 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>Aug 5 2019, 2:45 AM
Parents
R242:2ac699988111: GIT_SILENT Upgrade ECM and KF5 version requirements for 5.61.0 release.
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R242:bbad328bc241: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Aug 5 2019, 2:45 AM