openerp-canada team mailing list archive

Thread
Date

Re: lp:~openerp-canada/openobject-addons/l10n_ca_trunk_improvements into lp:openobject-addons

To: "Maxime Chambreuil \(http://www.savoirfairelinux.com\)" <maxime.chambreuil@xxxxxxxxxxxxxxxxxxxx>
From: "qdp \(OpenERP\)" <qdp-launchpad@xxxxxxxxxxx>
Date: Fri, 20 Jul 2012 15:57:20 -0000
In-reply-to: <20120609155028.14814.35488.launchpad@ackee.canonical.com>
Reply-to: mp+109486@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

lp:~openerp-canada/openobject-addons/l10n_ca_trunk_improvements into lp:openobject-addons
From: Maxime Chambreuil (http://www.savoirfairelinux.com), 2012-06-09