Diffusion Milou 4557c0a543ce

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

Authored by l10n daemon script <scripty@kde.org> on Sep 10 2017, 2:56 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>Sep 10 2017, 2:56 AM
Parents
R112:da4262a7e31b: spdx validation
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R112:4557c0a543ce: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Sep 10 2017, 2:56 AM