Diffusion Krita 06cc0c1d008b

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

Authored by l10n daemon script <scripty@kde.org> on Jan 22 2019, 4:30 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>Jan 22 2019, 4:30 AM
Parents
R37:301ebfc6ef37: Return the colorspace of the projection before returning the colorspace of theā€¦
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R37:06cc0c1d008b: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jan 22 2019, 4:30 AM