solve conflict in sfa/plc/aggregate.py
[sfa.git] / sfa / __init__.py