Diffusion KIO 5ffc909bd051

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

Authored by l10n daemon script <scripty@kde.org> on May 21 2019, 4:03 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>May 21 2019, 4:03 AM
Parents
R241:1208a51e9abf: Add Documents to the default list of Places
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R241:5ffc909bd051: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).May 21 2019, 4:03 AM