Diffusion Kate 03c5ac729b64

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

Authored by l10n daemon script <scripty@kde.org> on Dec 10 2018, 7:06 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 10 2018, 7:06 AM
Parents
R40:5a9fa2358c0c: ViewManager: Fix I18n_ARGUMENT_MISSING hint in message box when open a very…
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R40:03c5ac729b64: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Dec 10 2018, 7:06 AM