Diffusion KWin 498d40d06949

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

Authored by l10n daemon script <scripty@kde.org> on Jan 19 2018, 5:54 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>Jan 19 2018, 5:54 AM
Parents
R108:e200d7403110: [effects/blur] Disable texture cache on Wayland
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R108:498d40d06949: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jan 19 2018, 5:54 AM