Diffusion Krita cd8bac26b61f

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

Authored by l10n daemon script <scripty@kde.org> on May 31 2020, 6:21 PM.

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>May 31 2020, 6:21 PM
Parents
R37:75a0d157cc09: update style immediately after selecting it
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R37:cd8bac26b61f: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).May 31 2020, 6:21 PM