Diffusion KWin 6ce115224379

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

Authored by l10n daemon script <scripty@kde.org> on Nov 6 2018, 5:01 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>Nov 6 2018, 5:01 AM
Parents
R108:b6fe7dc11572: [effects/eyeonscreen] Move "use strict" to the beginning of the script
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R108:6ce115224379: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Nov 6 2018, 5:01 AM