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> Nov 17 2016, 7:26 PM - Parents
- R34:06c3888c81b7: Center on placemark when tapping on its coordinates
- Branches
- Unknown
- Tags
- References
- tag: v16.11.90, tag: v16.11.80