Diffusion KMail 278ad845eb4d

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

Authored by l10n daemon script <scripty@kde.org> on Aug 17 2019, 3:14 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 17 2019, 3:14 AM
Parents
R206:97585dd99b7b: Add info about kde release version too.
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R206:278ad845eb4d: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Aug 17 2019, 3:14 AM