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

Authored by l10n daemon script <scripty@kde.org> on Apr 17 2020, 4:18 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>Apr 17 2020, 4:18 AM
Parents
R838:d1f0ec4d3a4c: Screensharing: support variable stride
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R838:c3c840e151cc: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Apr 17 2020, 4:18 AM