slab: resolve merge conflict
authorMohamed Larabi <mohamed.larabi@inria.fr>
Tue, 4 Jun 2013 15:54:41 +0000 (17:54 +0200)
committerMohamed Larabi <mohamed.larabi@inria.fr>
Tue, 4 Jun 2013 15:54:41 +0000 (17:54 +0200)
commit02ef0460fbfc4904e7c66788588ce671b78f5d48
treeb9bfd6d64827f79e1112ade397b9ec29ef7ebb33
parent40fe5edc8ba583e99916bfd0546178412e64de79
slab: resolve merge conflict
sfa/senslab/slabaggregate.py