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

Authored by l10n daemon script <scripty@kde.org> on Apr 22 2019, 4:05 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>Apr 22 2019, 4:05 AM
Parents
R81:31d2476d651f: Merge remote-tracking branch 'origin/Applications/19.04'
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R81:46d07cdcc566: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Apr 22 2019, 4:05 AM