Diffusion Elisa 8146e06abcd3

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

Authored by l10n daemon script <scripty@kde.org> on Apr 25 2019, 4:06 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>Apr 25 2019, 4:06 AM
Differential Revision
D20779: makes KFileMetaData optional again
Parents
R255:731d4b34cfa8: GIT_SILENT made messages (after extraction)
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R255:8146e06abcd3: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Apr 25 2019, 4:06 AM