Diffusion Kate 20dfb9c74652

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

Authored by l10n daemon script <scripty@kde.org> on Jul 8 2019, 2:53 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 8 2019, 2:53 AM
Parents
R40:cd91625e8284: Snippets: Fix the keyboard shortcuts for new snippets not working
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R40:20dfb9c74652: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jul 8 2019, 2:53 AM