cfgitem.hxx seems to have an unresolved merge conflict, see the first
and last lines
Ilmari
On 18.2.2021 19.02, Dante Doménech wrote:
Hello.
It's the first time I'm doing this, so I have some doubts.
I did cherry pick a patch for 7.1.1 but I'm having a strange behaviour.
This file starmath/inc/cfgitem.hxx appears as a new creation, but only 2
lines of code should have been added.
Does anyone know what could be happening?
(patch over here: https://gerrit.libreoffice.org/c/core/+/111149
<https://gerrit.libreoffice.org/c/core/+/111149>)
_______________________________________________
LibreOffice mailing list
LibreOffice@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/libreoffice
_______________________________________________
LibreOffice mailing list
LibreOffice@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/libreoffice
