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

Authored by l10n daemon script <scripty@kde.org> on Sep 3 2019, 3:25 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 3 2019, 3:25 AM
Parents
R119:408f3ebbec9a: [Kicker/Kickoff] Re-word "Manage <app>..." menu item for greater clarity
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R119:1121b3b69c3a: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Sep 3 2019, 3:25 AM