[MERGE FAILED] use filelist install method for udkapi and offapi

"Fridrich Strba (via Code Review)" <gerrit -AT- gerrit.libreoffice.org>
Fri, 5 Apr 2013 23:32:05 +0000

Fridrich Strba has submitted this change and it FAILED to merge.

Change subject: use filelist install method for udkapi and offapi
......................................................................


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

Gerrit-MessageType: merge-failed
Gerrit-Change-Id: Id5925b8c101cd7cb70614a9a26f328dec92db8fa
Gerrit-PatchSet: 10
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon <dtardon@redhat.com>
Gerrit-Reviewer: Fridrich Strba <fridrich@documentfoundation.org>
Gerrit-Reviewer: LibreOffice gerrit bot <gerrit@libreoffice.org>
Gerrit-Reviewer: Michael Stahl <mstahl@redhat.com>

Context

[PATCH] use filelist install method for udkapi and offapi (continued)
- [PATCH] use filelist install method for udkapi and offapi · David Tardon (via Code Review)
- [PATCH] use filelist install method for udkapi and offapi · David Tardon (via Code Review)
- [PATCH] use filelist install method for udkapi and offapi · David Tardon (via Code Review)
- [PATCH] use filelist install method for udkapi and offapi · David Tardon (via Code Review)
- [PATCH] use filelist install method for udkapi and offapi · David Tardon (via Code Review)
- [PATCH] use filelist install method for udkapi and offapi · David Tardon (via Code Review)
- [PATCH] use filelist install method for udkapi and offapi · David Tardon (via Code Review)
- [PATCH] use filelist install method for udkapi and offapi · David Tardon (via Code Review)
- [PATCH] use filelist install method for udkapi and offapi · David Tardon (via Code Review)
- [MERGE FAILED] use filelist install method for udkapi and offapi · Fridrich Strba (via Code Review)
- [MERGE FAILED] use filelist install method for udkapi and offapi · Fridrich Strba (via Code Review)
- [PATCH] use filelist install method for udkapi and offapi · Fridrich Strba (via Code Review)
- [PUSHED] use filelist install method for udkapi and offapi · Fridrich Strba (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.