Diffusion Milou 3f4794a60058

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

Authored by l10n daemon script <scripty@kde.org> on Oct 20 2019, 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>Oct 20 2019, 3:22 AM
Parents
R112:8e78d4e1f7f3: Update version number for 5.17.80 GIT_SILENT
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R112:3f4794a60058: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Oct 20 2019, 3:22 AM