Cherry pick for 7.1.1
ilmari.lauhakangas at libreoffice.org
Thu Feb 18 17:07:55 UTC 2021
cfgitem.hxx seems to have an unresolved merge conflict, see the first
and last lines
On 18.2.2021 19.02, Dante Doménech wrote:
> 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
> LibreOffice mailing list
> LibreOffice at lists.freedesktop.org
More information about the LibreOffice