[MERGE FAILED] fdo#37222 and possibly fdo#37219

[Anurag Kanungo]

Hi,

How to resolve this , i have no idea .

Thanks


On Fri, May 17, 2013 at 9:12 PM, Fridrich Strba (via Code Review) <
gerrit at gerrit.libreoffice.org> wrote:

> Fridrich Strba has submitted this change and it FAILED to merge.
>
> Change subject: fdo#37222 and possibly fdo#37219
> ......................................................................
>
>
> 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/3948
> To unsubscribe, visit https://gerrit.libreoffice.org/settings
>
> Gerrit-MessageType: merge-failed
> Gerrit-Change-Id: I76611c0e3382e27289d648942a98b092edc430ae
> Gerrit-PatchSet: 1
> Gerrit-Project: core
> Gerrit-Branch: master
> Gerrit-Owner: Anurag Kanungo <anuragkanungo at gmail.com>
> Gerrit-Reviewer: Fridrich Strba <fridrich at documentfoundation.org>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20130517/6cbd2a14/attachment.html>