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

Authored by l10n daemon script <scripty@kde.org> on Mar 17 2020, 5:12 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>Mar 17 2020, 5:12 AM
Parents
R120:695fec4a2d41: [applets/systemtray] Fix expanded representation's internal margins
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R120:dbdb78b4585d: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Mar 17 2020, 5:12 AM