Diffusion KIO c492f976391d

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

Authored by l10n daemon script <scripty@kde.org> on Feb 4 2020, 5:04 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>Feb 4 2020, 5:04 AM
Parents
R241:8a834785c875: file ioslave: stop copying as soon as the ioslave is killed
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R241:c492f976391d: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Feb 4 2020, 5:04 AM