Diffusion KWin 226fb7d30b27

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

Authored by l10n daemon script <scripty@kde.org> on Aug 7 2018, 3:48 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>Aug 7 2018, 3:48 AM
Parents
R108:7aedacd89eb2: Fractional scaling in DRM kscreen integration
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R108:226fb7d30b27: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Aug 7 2018, 3:48 AM