Diffusion KWin b9f5aa3cf6bd

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

Authored by l10n daemon script <scripty@kde.org> on Nov 7 2017, 3:44 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 7 2017, 3:44 AM
Parents
R108:4bfeeb3084a5: [platforms/drm] Fix cursor hotspot for inverted landscape rotation
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R108:b9f5aa3cf6bd: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Nov 7 2017, 3:44 AM