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

Authored by l10n daemon script <scripty@kde.org> on May 19 2019, 6:46 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>May 19 2019, 6:46 AM
Parents
R114:268ed1db19d5: Move knsrc files to the new location
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R114:064df9b02af5: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).May 19 2019, 6:46 AM