Diffusion Kate 6839f6adb250

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

Authored by l10n daemon script <scripty@kde.org> on Jul 28 2018, 3:31 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>Jul 28 2018, 3:31 AM
Parents
R40:fe4373314b44: SymbolView: Update current item and sorting after parsing
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R40:6839f6adb250: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jul 28 2018, 3:31 AM