openerp-dutch team mailing list archive
-
openerp-dutch team
-
Mailing list archive
-
Message #00150
Re: [Merge] lp:~ludo-neobis/openobject-server/fix_for_bug_1180692 into lp:openobject-server
Diff has conflicts, did you mean to target lp:openobject-server/7.0?
--
https://code.launchpad.net/~ludo-neobis/openobject-server/fix_for_bug_1180692/+merge/164093
Your team OpenERP Dutch Team - Nederland is requested to review the proposed merge of lp:~ludo-neobis/openobject-server/fix_for_bug_1180692 into lp:openobject-server.
References