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

Authored by l10n daemon script <scripty@kde.org> on Nov 9 2019, 4:38 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>Nov 9 2019, 4:38 AM
Parents
R161:a7acc73982de: GIT_SILENT: it compiles fine without deprecated methods
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R161:facfb445a6f8: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Nov 9 2019, 4:38 AM