Diffusion KWin 1b8e5061abf0

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

Authored by l10n daemon script <scripty@kde.org> on May 31 2019, 6:34 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>May 31 2019, 6:34 AM
Parents
R108:4ece0a9f40b6: Merge branch 'Plasma/5.12' into Plasma/5.16
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R108:1b8e5061abf0: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).May 31 2019, 6:34 AM