Diffusion KWin a32e103fe806

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

Authored by l10n daemon script <scripty@kde.org> on Apr 6 2019, 7:08 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 6 2019, 7:08 AM
Parents
R108:79ce5dac9a2a: Also unset QT_SCALE_FACTOR
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R108:a32e103fe806: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Apr 6 2019, 7:08 AM