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

Authored by l10n daemon script <scripty@kde.org> on Aug 8 2019, 3: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>Aug 8 2019, 3:05 AM
Parents
R119:87d9610e206f: [KRDB] Fix wrong names in GTK colordef exports
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R119:30d870242e2d: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Aug 8 2019, 3:05 AM