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

Authored by l10n daemon script <scripty@kde.org> on Oct 24 2019, 7:12 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 24 2019, 7:12 AM
Parents
R120:0e25e9ad108d: clear the cells before relayouting the items
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R120:7cb598801c13: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Oct 24 2019, 7:12 AM