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

Authored by l10n daemon script <scripty@kde.org> on Sep 8 2019, 3:08 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>Sep 8 2019, 3:08 AM
Parents
R39:90aa6c665ed3: (others): Port away from foreach loops over members without calls to owner
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R39:22c763f46f57: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Sep 8 2019, 3:08 AM