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

Authored by l10n daemon script <scripty@kde.org> on Aug 18 2018, 3:44 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 18 2018, 3:44 AM
Parents
R320:1e44637d0315: [Activities Linking] Don't offer for non-local URLs
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R320:59079921a6dd: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Aug 18 2018, 3:44 AM