Diffusion Krita d472c7cab035

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

Authored by l10n daemon script <scripty@kde.org> on Apr 10 2019, 4:04 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 10 2019, 4:04 AM
Parents
R37:b7d14df990f3: packaging macOS: Bump Vc version to 1.4.1
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R37:d472c7cab035: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Apr 10 2019, 4:04 AM