Diffusion KWin 05d565671295

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

Authored by l10n daemon script <scripty@kde.org> on Oct 19 2019, 7:16 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 19 2019, 7:16 AM
Parents
R108:2497f901d712: [effects/startupfeedback] Scale application icon size with cursor size
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R108:05d565671295: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Oct 19 2019, 7:16 AM