[MERGE FAILED] Change String class to OUString class in two files.

"Miklos Vajna (via Code Review)" <gerrit -AT- gerrit.libreoffice.org>

Mon, 5 Aug 2013 10:32:06 +0000

Miklos Vajna has submitted this change and it FAILED to merge. Change subject: Change String class to OUString class in two files. ...................................................................... Your change could not be merged due to a path conflict. Please merge (or rebase) the change locally and upload the resolution for review. -- To view, visit https://gerrit.libreoffice.org/5091 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merge-failed Gerrit-Change-Id: I3d05c9705d221b5abe02d09845cd3cdc5381e201 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Mihály Palenik <palenik.mihaly@gmail.com> Gerrit-Reviewer: LibreOffice gerrit bot <gerrit@libreoffice.org> Gerrit-Reviewer: Mihály Palenik <palenik.mihaly@gmail.com> Gerrit-Reviewer: Miklos Vajna <vmiklos@suse.cz> Gerrit-Reviewer: Norbert Thiebaud <nthiebaud@gmail.com>

Context

[MERGE FAILED] Change String class to OUString class in two files. · Miklos Vajna (via Code Review)

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.