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> Mar 15 2016, 4:04 AM - Parents
- R534:589406e775bc: update cmake_min_req to match kdelibs4 and enable newer policies, so that cmake…
- Branches
- Unknown
- Tags
- References
- HEAD -> master