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"
Description
Description
Details
Details
- Committed
l10n daemon script <scripty@kde.org> Sep 21 2017, 2:56 AM - Differential Revision
- D7888: Make sure OpenGL Context is valid before deleting shader
- Parents
- R108:e284febe2493: Merge branch 'Plasma/5.11'
- Branches
- Unknown
- Tags