Diffusion KIO cdea54f38976

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

Authored by l10n daemon script <scripty@kde.org> on Mar 2 2020, 4:42 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>Mar 2 2020, 4:42 AM
Parents
R241:ebe7714300af: Improve KDirModel to avoid showing '+' if there are no subdirs
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R241:cdea54f38976: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Mar 2 2020, 4:42 AM