openerp-dev-web team mailing list archive

Thread
Date

Re: lp:~openerp-dev/openobject-client-web/proto61-login-and-session-persistence-xmo into lp:~openerp-dev/openobject-client-web/trunk-proto61

To: mp+54003@xxxxxxxxxxxxxxxxxx
From: "Xavier \(Open ERP\)" <xmo@xxxxxxxxxxx>
Date: Sat, 19 Mar 2011 13:15:53 -0000
In-reply-to: <20110318143313.1876.78511.launchpad@loganberry.canonical.com>
Reply-to: mp+54003@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

> Line no. 30, 38, 113 will create blocking.
> You have merged your previous code from somewhere.

Nope, they're just merge conflict markers because trunk-proto61 had probably gotten some conflicting changes between my forking this branch and my creating the merge proposal. Here, somebody added "on_log" on the session object in trunk at the same point where I added the local-data loading stuff.
-- 
https://code.launchpad.net/~openerp-dev/openobject-client-web/proto61-login-and-session-persistence-xmo/+merge/54003
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-client-web/trunk-proto61.

References

lp:~openerp-dev/openobject-client-web/proto61-login-and-session-persistence-xmo into lp:~openerp-dev/openobject-client-web/trunk-proto61
From: Xavier (Open ERP), 2011-03-18