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

Authored by l10n daemon script <scripty@kde.org> on Aug 13 2017, 2:59 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 13 2017, 2:59 AM
Parents
R119:4ff8801450c6: Don't show appstream action if we can't find an app to open appstream:// URLs.
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R119:8dc89b7f3daf: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Aug 13 2017, 2:59 AM