Diffusion Krita 38c6f99567ed

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

Authored by l10n daemon script <scripty@kde.org> on Feb 19 2020, 4:41 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>Feb 19 2020, 4:41 AM
Parents
R37:29a46ef14f08: Point people at the right mingw file which we copied
Branches
Unknown
Tags
Unknown
References
refs/keep-around/38c6f99567ed4d223b32d7166e53a3cd6c38217e
l10n daemon script <scripty@kde.org> committed R37:38c6f99567ed: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Feb 19 2020, 4:41 AM