[MERGE FAILED] Ugly Hack: using our own WebConfigSet while the Topic stuff ...

[Michael Meeks (via Code Review)]

Michael Meeks has submitted this change and it FAILED to merge.

Change subject: Ugly Hack: using our own WebConfigSet while the Topic stuff is not integrated.
......................................................................


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/3028
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merge-failed
Gerrit-Change-Id: I0df92af6b01e5eab99212bb1587f7165c70fd59b
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Javier Fernandez <javier.fgb at gmail.com>
Gerrit-Reviewer: LibreOffice gerrit bot <gerrit at libreoffice.org>
Gerrit-Reviewer: Michael Meeks <michael.meeks at suse.com>