Diffusion KWin 9f3b817bdcb2

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

Authored by l10n daemon script <scripty@kde.org> on Mar 19 2020, 4:51 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>Mar 19 2020, 4:51 AM
Parents
R108:29fa85eed1d7: Use SurfaceInterface::boundingRect()
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R108:9f3b817bdcb2: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Mar 19 2020, 4:51 AM