> 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. _______________________________________________ Mailing list: https://launchpad.net/~openerp-dev-web Post to : [email protected] Unsubscribe : https://launchpad.net/~openerp-dev-web More help : https://help.launchpad.net/ListHelp
