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

Authored by l10n daemon script <scripty@kde.org> on Oct 28 2019, 7: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>Oct 28 2019, 7:52 AM
Parents
R32:a245d5f016f1: appimage: bump plasma deps to v5.17.1
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R32:f39cb1580eac: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Oct 28 2019, 7:52 AM