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

Authored by l10n daemon script <scripty@kde.org> on Jun 4 2019, 3:27 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 4 2019, 3:27 AM
Parents
R119:9aa8efc553ca: Fix forward declaration
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R119:468f77565b46: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jun 4 2019, 3:27 AM