Diffusion KWin df28de871686

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

Authored by l10n daemon script <scripty@kde.org> on Jan 24 2018, 4:14 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>Jan 24 2018, 4:14 AM
Parents
R108:86f835ac357e: Merge branch 'Plasma/5.12'
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R108:df28de871686: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jan 24 2018, 4:14 AM