Merge artifacts in I10n

[Simpel]

Today I got the message for 2 new untranslated keys. But they are no keys:

<<<<<<< XWIKI-24123

>>>>>>> master

For me it looks like artefacts from an interrupted merge.

See:

• XWiki Platform/xwiki-oldcore — German @ Weblate XWiki.org: XWIKI-24123
• XWiki Platform/xwiki-oldcore — German @ Weblate XWiki.org: master

Regards Simpel

[tmortagne]

It does indeed look like a bad merge from a pull request. Thanks for the report, @surli is on it.

[surli]

It’s been fixed, thanks for the report.