Diffusion Kexi 713d71d9b879

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

Authored by l10n daemon script <scripty@kde.org> on Mar 5 2018, 4:12 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>Mar 5 2018, 4:12 AM
Parents
R71:a0166350c54a: Merge branch '3.1'
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R71:713d71d9b879: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Mar 5 2018, 4:12 AM