Diffusion KWin 382077f87204

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

Authored by l10n daemon script <scripty@kde.org> on Oct 10 2019, 3:36 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 10 2019, 3:36 AM
Parents
R108:1a9a49ab7a44: don't allow to resize or move fullscreen windows
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R108:382077f87204: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Oct 10 2019, 3:36 AM