openerp-canada team mailing list archive
-
openerp-canada team
-
Mailing list archive
-
Message #00053
Re: lp:~openerp-canada/openobject-addons/l10n_ca_trunk_improvements into lp:openobject-addons
Hi Maxime,
when i tried to merge your branch into the trunk i got 8 conflicts. It's probably because we replaced tabs with 4 spaces few time ago (29th of June). Can you do the same in your branch (or merge the trunk into)?
Thanks
Quentin
--
https://code.launchpad.net/~openerp-canada/openobject-addons/l10n_ca_trunk_improvements/+merge/109486
Your team OpenERP Canada Team is subscribed to branch lp:~openerp-canada/openobject-addons/l10n_ca_trunk_improvements.
References