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

Authored by l10n daemon script <scripty@kde.org> on Aug 5 2019, 8:20 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>Aug 5 2019, 8:20 AM
Parents
rLIBKLEO059cbd300ad6: GIT_SILENT: Prepare 5.12.0
Branches
Unknown
Tags
Unknown
References
tag: v19.08.0
l10n daemon script <scripty@kde.org> committed rLIBKLEOc4c2d1c46f98: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Aug 5 2019, 8:20 AM