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

Authored by l10n daemon script <scripty@kde.org> on Feb 18 2018, 5:48 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 18 2018, 5:48 AM
Parents
R53:bccaa0fa3dbb: Update conversionGenerator.py to match output file.
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R53:51b563aad2a8: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Feb 18 2018, 5:48 AM