subject:"\[Be\-devel\] broken merge"

Re: [Be-devel] broken merge

2012-01-02 Thread Chris Ball

Hi Matěj, On Mon, Jan 02 2012, Matěj Cepl wrote: > https://gitorious.org/be/be/blobs/master/interfaces/web/web.py#line81 > and > https://gitorious.org/be/be/blobs/master/interfaces/web/web.py#line192 > > seem to testify about something wrong with this merge > > https://gitorious.org/be/be/commit/5

[Be-devel] broken merge

2012-01-02 Thread Matěj Cepl

Hi, https://gitorious.org/be/be/blobs/master/interfaces/web/web.py#line81 and https://gitorious.org/be/be/blobs/master/interfaces/web/web.py#line192 seem to testify about something wrong with this merge https://gitorious.org/be/be/commit/59d39826cc04b30520171f56df81067ff582aa2e Apparently, the