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

[Miklos Vajna (via Code Review)]

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 at gmail.com>
Gerrit-Reviewer: LibreOffice gerrit bot <gerrit at libreoffice.org>
Gerrit-Reviewer: Mihály Palenik <palenik.mihaly at gmail.com>
Gerrit-Reviewer: Miklos Vajna <vmiklos at suse.cz>
Gerrit-Reviewer: Norbert Thiebaud <nthiebaud at gmail.com>