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

Authored by l10n daemon script <scripty@kde.org> on Jun 19 2019, 3:20 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>Jun 19 2019, 3:20 AM
Parents
R32:6ccb83fe716b: ninjabuilder: port foreach -> range-based for
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R32:099765c086bd: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jun 19 2019, 3:20 AM