Review: Disapprove
You have very conflicts in your source, you should make pull from 
openobject-server branch, merge in local, solve conflicts and if you want 
return to do propose this merge.
-- 
https://code.launchpad.net/~openerp-community/openobject-server/edannenberg_frequentcronjobs/+merge/39276
Your team OpenERP Community is subscribed to branch 
lp:~openerp-community/openobject-server/edannenberg_frequentcronjobs.

_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp

Reply via email to