Skip to content

Add a note about merge conflicts in `gitlab.pot`

Bob Van Landuyt requested to merge bvl-pot-merge-conflicts-docs into master

This is probably the easiest way to deal with merge conflicts in the locale/gitlab.pot file.

/cc @jarka

Merge request reports