Fixed small merge problems.
authorSandrine Avakian <sandrine.avakian@inria.fr>
Tue, 26 Jun 2012 09:05:36 +0000 (11:05 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Tue, 26 Jun 2012 09:05:36 +0000 (11:05 +0200)
commit52234af8017391f031ef4a92f6df43e140765fcf
tree251ff22314290ac37526f1a5504bc78215f26439
parente8fc48e051df886018a44560a746db08e564cd73
Fixed small merge problems.
sfa/senslab/OARrestapi.py
sfa/senslab/slabdriver.py