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

Authored by l10n daemon script <scripty@kde.org> on Sep 16 2017, 3:01 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
cordlandwehrJan 2 2018, 8:15 PM
Parents
R72:193ccd4e1306: Fix the desktop file (Exec key)
Branches
Unknown
Tags
Unknown