broken merge

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 conflict has not been resolved properly.

Matěj
--

-- 
http://www.ceplovi.cz/matej/, Jabber: mcepl<at>ceplovi.cz
GPG Finger: 89EF 4BC6 288A BF43 1BAB  25C3 E09F EF25 D964 84AC

understand, v.:
     To reach a point, in your investigation of some subject, at
     which you cease to examine what is really present, and
     operate on the basis of your own internal model instead.

_______________________________________________
Be-devel mailing list
Be-devel <at> bugseverywhere.org
http://void.printf.net/cgi-bin/mailman/listinfo/be-devel