Diffusion KWin 1bd35abebbbf

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

Authored by l10n daemon script <scripty@kde.org> on Jun 29 2018, 3:22 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>Jun 29 2018, 3:22 AM
Parents
R108:0bd5eff8623d: Make keyboard focus a pointer constraints necessity
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R108:1bd35abebbbf: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jun 29 2018, 3:22 AM