Diffusion KWin e3024908f5f1

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

Authored by l10n daemon script <scripty@kde.org> on Jun 10 2017, 2:29 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>Jun 10 2017, 2:29 AM
Parents
R108:c5861b99eb95: Update version number for 5.10.0 GIT_SILENT
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R108:e3024908f5f1: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jun 10 2017, 2:29 AM