It seems there was a snag in the conversion: the file addons/base/controllers/__init__.py disappeared in the process. I re-added it in lp:openerp-web. I would recommend that you merge lp:openerp-web in your respective branches and *not* add it back yourself, to avoid spurious conflicts (I'm not sure how bazaar deals with the same file being created in multiple merge parents, but I doubt it ends well). _______________________________________________ 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
