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

Authored by l10n daemon script <scripty@kde.org> on Nov 14 2019, 9:24 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>Nov 14 2019, 9:24 AM
Parents
rKLEOPATRA1d45a8c1928c: GIT_SILENT: Prepare 5.13.0beta1
Branches
Unknown
Tags
Unknown
References
tag: v19.11.80, tag: refs/backups/tag-v20.03.80-1584747909
l10n daemon script <scripty@kde.org> committed rKLEOPATRA3a868de821cc: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Nov 14 2019, 9:24 AM