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

Authored by l10n daemon script <scripty@kde.org> on Aug 20 2019, 6:31 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>Aug 20 2019, 6:31 AM
Parents
R120:eaa5e74c04c5: Add missing include (QJsonArray) to fix compilation with Qt 5.13
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R120:6c5bb0ea2274: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Aug 20 2019, 6:31 AM