GitLab

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"

CCBUG: 362152
(still a bug as it doesn't want to change font/size when we change it from settings)

CCBUG: 362152

This won't break the standalone build nor trigger an error when building the whole kdepim module.