Diffusion Kate cece54251db8

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

Authored by l10n daemon script <scripty@kde.org> on Mar 30 2019, 4:56 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>Mar 30 2019, 4:56 AM
Parents
R40:5d28eaaf9041: PreviewWidget: Avoid preview update when doc type is not supported
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R40:cece54251db8: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Mar 30 2019, 4:56 AM