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

Authored by l10n daemon script <scripty@kde.org> on Aug 30 2019, 3:27 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, 3:27 AM
Parents
R116:1fd01b2b9c2d: Use new more appropriate "view-barcode-qr" icon Added in https://phabricator.
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R116:4a936d21cbc1: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Aug 30 2019, 3:27 AM