Diffusion Milou 0b32db3d8cd7

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

Authored by l10n daemon script <scripty@kde.org> on Dec 17 2019, 4:48 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 17 2019, 4:48 AM
Parents
R112:ca27d4688a90: Merge branch 'Plasma/5.17'
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R112:0b32db3d8cd7: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Dec 17 2019, 4:48 AM