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

Authored by l10n daemon script <scripty@kde.org> on May 9 2020, 4:56 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 9 2020, 4:56 AM
Parents
R116:040a5c8ce9b0: Icon in system tray missing when WireGuard connection active on startup
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R116:7c915638de83: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).May 9 2020, 4:56 AM