Diffusion KWin a28410d80a0d

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

Authored by l10n daemon script <scripty@kde.org> on Nov 26 2018, 4:33 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 26 2018, 4:33 AM
Parents
R108:1e73ae4c471e: Copy effective window type in Deleted
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R108:a28410d80a0d: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Nov 26 2018, 4:33 AM