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

Authored by l10n daemon script <scripty@kde.org> on Nov 22 2018, 5:02 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>Nov 22 2018, 5:02 AM
Parents
R119:5bea4b98ad00: Sync text for empty trash
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R119:ed3f246d3b6e: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Nov 22 2018, 5:02 AM