Diffusion KMail dfbf25a02a21

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

Authored by l10n daemon script <scripty@kde.org> on May 11 2019, 7:07 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>May 11 2019, 7:07 AM
Parents
R206:dd7df1004032: GIT_SILENT: Prepare 5.11.2
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R206:dfbf25a02a21: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).May 11 2019, 7:07 AM