Diffusion KIO 6fd35a246d7b

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

Authored by l10n daemon script <scripty@kde.org> on Nov 25 2018, 4:26 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>Nov 25 2018, 4:26 AM
Parents
R241:30bd13757cd5: Revert "Show list of tags in PlacesView"
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R241:6fd35a246d7b: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Nov 25 2018, 4:26 AM