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

Authored by l10n daemon script <scripty@kde.org> on Aug 30 2019, 7:24 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>Aug 30 2019, 7:24 AM
Parents
R166:331d3ceaaf74: FIX: Close spectacle if it's started with: -b -c
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R166:fb0ab6631826: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Aug 30 2019, 7:24 AM