Diffusion KIO 36c8083423ba

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

Authored by l10n daemon script <scripty@kde.org> on Sep 15 2018, 3: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>Sep 15 2018, 3:56 AM
Parents
R241:5404c4e3eb63: Remove deprecated method
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R241:36c8083423ba: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Sep 15 2018, 3:56 AM