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

Authored by l10n daemon script <scripty@kde.org> on Jan 20 2019, 4:51 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 20 2019, 4:51 AM
Parents
R113:9871f0b4a710: Update version number for 5.15.80 GIT_SILENT
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R113:3cedbce3f405: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jan 20 2019, 4:51 AM