Review: Needs Fixing Hi Ian, thank you for updating the code. I am terribly sorry to bother you again, but your last update seemed to have incurred a typo in the form of a trailing character 'w' in line 118 of __openerp__.py.
Removing this character should resolve the conflict that is now shown in the diff preview. Cheers, Stefan. -- https://code.launchpad.net/~ibeardslee/openobject-addons/users_ldap-tls/+merge/71785 Your team OpenERP Community is subscribed to branch lp:~openerp-community/openobject-addons/stefan-therp_lp794584. _______________________________________________ Mailing list: https://launchpad.net/~openerp-community Post to : [email protected] Unsubscribe : https://launchpad.net/~openerp-community More help : https://help.launchpad.net/ListHelp
