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> Jun 3 2020, 3:19 AM - Parents
- R37:6c9a7a8d88ea: Created a shader for drawing brush tool outline.
- Branches
- Unknown
- Tags
- References
- refs/keep-around/45d0ae47a3a16937c46201a636ee8214ed6d971c