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

Authored by l10n daemon script <scripty@kde.org> on Sep 25 2019, 3:23 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 25 2019, 3:23 AM
Parents
R223:4a4a2a1b524b: Add "find in this document" to selection context menu
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R223:59f13d9bcfc6: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Sep 25 2019, 3:23 AM