Diffusion Elisa 8a79a27538b2

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

Authored by l10n daemon script <scripty@kde.org> on Feb 14 2020, 4:55 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>Feb 14 2020, 4:55 AM
Parents
R255:47198d48b27a: Fix Context view's scroll content being slightly too wide
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R255:8a79a27538b2: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Feb 14 2020, 4:55 AM