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

Authored by l10n daemon script <scripty@kde.org> on Jan 6 2019, 8:45 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>Jan 6 2019, 8:45 AM
Parents
rKLEOPATRAd01178b161f0: GIT_SILENT: Prepare 5.10.1
Branches
Unknown
Tags
Unknown
References
tag: v18.12.1
l10n daemon script <scripty@kde.org> committed rKLEOPATRA3afb7c18af9a: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jan 6 2019, 8:45 AM