Diffusion KWin 1e81a12b9966

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

Authored by l10n daemon script <scripty@kde.org> on Apr 7 2017, 2:09 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>Apr 7 2017, 2:09 AM
Parents
R108:489e6954c5ff: Support the emergency show property on ksld's lock screen window
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R108:1e81a12b9966: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Apr 7 2017, 2:09 AM