Diffusion KWin 8cb6d42191ef

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

Authored by l10n daemon script <scripty@kde.org> on Feb 21 2017, 11:50 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>Feb 21 2017, 11:50 AM
Parents
R108:d1a9f4ed3e24: merge Plasma/5.9
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R108:8cb6d42191ef: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Feb 21 2017, 11:50 AM