Diffusion Kate 1ae339762b95

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

Authored by l10n daemon script <scripty@kde.org> on Nov 20 2017, 3:28 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>Nov 20 2017, 3:28 AM
Parents
R40:b606c86494ea: GIT_SILENT made messages (after extraction)
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R40:1ae339762b95: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Nov 20 2017, 3:28 AM