Diffusion Krita 4fb9f1525987

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

Authored by l10n daemon script <scripty@kde.org> on Apr 25 2019, 4:05 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 25 2019, 4:05 AM
Parents
R37:cea332c4007c: GIT_SILENT made messages (after extraction)
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R37:4fb9f1525987: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Apr 25 2019, 4:05 AM