Diffusion KWin 9d4c8988bf5e

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

Authored by l10n daemon script <scripty@kde.org> on Jul 31 2019, 7:08 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>Jul 31 2019, 7:08 AM
Parents
R108:bbc6aaddcc6f: Update version number for 5.16.4 GIT_SILENT
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R108:9d4c8988bf5e: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jul 31 2019, 7:08 AM