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

Authored by l10n daemon script <scripty@kde.org> on Aug 5 2019, 4:52 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, 4:52 AM
Parents
rLIBKLEO1d7c385904ca: GIT_SILENT: Update dependancy
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed rLIBKLEO82e8100a3ce7: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Aug 5 2019, 4:52 AM