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

Authored by l10n daemon script <scripty@kde.org> on Nov 16 2019, 4:09 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 16 2019, 4:09 AM
Parents
R134:11bfabfcbee9: Ensure comments fetch for KNS starts on the right page
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R134:cff214d9f64f: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Nov 16 2019, 4:09 AM