Diffusion KWin 1f645b4bc5dd

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

Authored by l10n daemon script <scripty@kde.org> on Nov 20 2018, 7:43 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>Nov 20 2018, 7:43 AM
Parents
R108:aace9b167581: actually initialize kcrash for xclipboardsync
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R108:1f645b4bc5dd: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Nov 20 2018, 7:43 AM