Change-Id: Ifcd8441f175040dbcb81dfd4d2a62a7c50b8583b Reviewed-on: https://gerrit.libreoffice.org/25300 Reviewed-by: Olivier Hallot <ohallot@collabora.co.uk> Tested-by: Olivier Hallot <ohallot@collabora.co.uk>
fix merge conflict Change-Id: I8c67b61fdc6042291890bf80b47d762dd89d76d4 Reviewed-on: https://gerrit.libreoffice.org/22972 Reviewed-by: Olivier Hallot <ohallot@collabora.co.uk> Tested-by: Olivier Hallot <ohallot@collabora.co.uk>