Diffusion KWin 2c8ff56540a3

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

Authored by l10n daemon script <scripty@kde.org> on Dec 12 2019, 4:47 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>Dec 12 2019, 4:47 AM
Parents
R108:e7da4d65ecbd: [platforms/x11/standalone] Use intel swap events by default
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R108:2c8ff56540a3: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Dec 12 2019, 4:47 AM