Re: Merge Conflict on Gerrit – The Document Foundation Mailing List Archives

julien2412 <serval2412 -AT- yahoo.fr>

Sun, 23 Feb 2020 06:22:58 -0700 (MST)

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

Context

Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.