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

Authored by l10n daemon script <scripty@kde.org> on Sep 18 2019, 3:36 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 18 2019, 3:36 AM
Parents
R106:842d64591d84: Add a per-process network information plugin
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R106:324276b1e141: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Sep 18 2019, 3:36 AM