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

Authored by l10n daemon script <scripty@kde.org> on Oct 15 2018, 3:36 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 15 2018, 3:36 AM
Parents
R32:29b5f14a6caa: Merge branch '5.3'
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R32:eaa02d466c4b: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Oct 15 2018, 3:36 AM