Diffusion KWin bc45ff145851

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

Authored by l10n daemon script <scripty@kde.org> on Sep 2 2017, 2:55 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>Sep 2 2017, 2:55 AM
Parents
R108:20e22ec26a4a: Deprecate global KWin::displayWidth and KWin::displayHeight
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R108:bc45ff145851: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Sep 2 2017, 2:55 AM