Diffusion KWin c7aa7212737e

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

Authored by l10n daemon script <scripty@kde.org> on Oct 24 2018, 6:42 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 24 2018, 6:42 AM
Parents
R108:980e390743c1: [kcmkwin/ruleswidget] Disable "Detect" button when countdown is running
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R108:c7aa7212737e: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Oct 24 2018, 6:42 AM