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

Authored by l10n daemon script <scripty@kde.org> on Jun 1 2020, 3:55 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
sandsmarkJun 1 2020, 5:31 PM
Parents
R319:0380399b81e1: Take in consideration the Word Characters of the profile
Branches
Unknown
Tags
Unknown