Diffusion KWin 0fbd335bf0c1

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

Authored by l10n daemon script <scripty@kde.org> on Aug 30 2017, 7:37 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>Aug 30 2017, 7:37 AM
Parents
R108:1f3e7db0bdbd: Update version number for 5.10.5 GIT_SILENT
Branches
Unknown
Tags
Unknown
References
Plasma/5.10
l10n daemon script <scripty@kde.org> committed R108:0fbd335bf0c1: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Aug 30 2017, 7:37 AM