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

Authored by l10n daemon script <scripty@kde.org> on May 15 2020, 4:22 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>May 15 2020, 4:22 AM
Parents
R120:7a4ea26a6561: Automatically close Clipboard applet after clearing history or deleting theā€¦
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R120:485ebc75710a: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).May 15 2020, 4:22 AM