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

Authored by l10n daemon script <scripty@kde.org> on Oct 8 2019, 6:56 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 8 2019, 6:56 AM
Parents
R120:0441a8eb4930: Fix erroneous conversion to signed int
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R120:09996ea7f5d9: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Oct 8 2019, 6:56 AM