solve conflict in sfa/plc/aggregate.py
[sfa.git] / LICENSE.txt
2008-12-05 Reed MoranLicense file