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> Dec 24 2018, 4:19 AM - Parents
- R266:8dd9ec1b9403: Use correct icon for Python 3 scripts BUG: 402367 FIXED-IN: 5.54
- Branches
- Unknown
- Tags