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

Authored by l10n daemon script <scripty@kde.org> on Jan 10 2019, 4:24 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>Jan 10 2019, 4:24 AM
Parents
R32:7055e9d58af2: Merge remote-tracking branch 'origin/5.3'
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R32:68a4abda4d94: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jan 10 2019, 4:24 AM