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

Authored by l10n daemon script <scripty@kde.org> on Dec 3 2019, 8:25 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>Dec 3 2019, 8:25 AM
Parents
R114:cf0f35aa0700: [applets/Weather] Activate Apply button when clicking on a table item
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R114:f583df83a003: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Dec 3 2019, 8:25 AM