Diffusion Kate 9542b38da260

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

Authored by l10n daemon script <scripty@kde.org> on Dec 31 2018, 4:12 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>Dec 31 2018, 4:12 AM
Parents
R40:739a730f528c: S&R: Replace matches in chunks also in files.
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R40:9542b38da260: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Dec 31 2018, 4:12 AM