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

Authored by l10n daemon script <scripty@kde.org> on May 1 2019, 4: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>May 1 2019, 4:05 AM
Parents
R120:e9c72a0420c1: Add SDDM theme login load feedback
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R120:194f49655b5c: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).May 1 2019, 4:05 AM