Diffusion KWin 501128ccf4e6

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

Authored by l10n daemon script <scripty@kde.org> on Oct 21 2016, 9:32 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>Oct 21 2016, 9:32 AM
Parents
R108:ebe12c55ba67: Remove GLVertextBuffer::setVirtualScreenSize
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R108:501128ccf4e6: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Oct 21 2016, 9:32 AM