Diffusion K3b dd5059ed423b

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

Authored by l10n daemon script <scripty@kde.org> on Apr 13 2019, 3:38 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>Apr 13 2019, 3:38 AM
Parents
R467:70cb5a5e8259: Fix no Elapsed time information issue after finished job..
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R467:dd5059ed423b: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Apr 13 2019, 3:38 AM