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

Authored by l10n daemon script <scripty@kde.org> on Feb 22 2017, 4:49 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>Feb 22 2017, 4:49 AM
Parents
R120:f17a395a40e9: Overhaul app associativity heuristic to give precendence to StartupWMClass.
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R120:913b99840a9a: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Feb 22 2017, 4:49 AM