From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 14 Nov 2011 20:33:26 +0000 (+0100)
Subject: solve conflict in sfa/plc/aggregate.py
X-Git-Tag: sfa-1.1-3~26^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f97c73f11e336387e67232925e7fc408f24db48e;p=sfa.git

solve conflict in sfa/plc/aggregate.py
---

f97c73f11e336387e67232925e7fc408f24db48e