Re: Merge Conflict on Gerrit

[julien2412 <serval2412@xxxxxxxx>]

Hi Regina,

I gave it a try and it seems the conflict is due to the patch
https://cgit.freedesktop.org/libreoffice/core/commit/?id=1f625b3f74c6e6e5ef345a3e017061be918e443b
which has been merged.

Julien



--
Sent from: http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
_______________________________________________
LibreOffice mailing list
LibreOffice@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/libreoffice