Diffusion Krita f3eff3b989a1

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

Authored by l10n daemon script <scripty@kde.org> on Jul 28 2016, 9:52 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 28 2016, 9:52 AM
Parents
R37:4c74052231ba: Set default save format to .kra instead of random .exr
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R37:f3eff3b989a1: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jul 28 2016, 9:52 AM