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

Authored by l10n daemon script <scripty@kde.org> on Oct 22 2019, 3:20 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 22 2019, 3:20 AM
Parents
R120:c9c0f070a91b: edit mode action and dbus
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R120:23a5d0ce7562: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Oct 22 2019, 3:20 AM