X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fgeneric%2Fiotlab.py;h=d5636a7cab5f9129ebd3e66d279208d81d8aa63d;hb=a18ad5b1dbc2a1dd346784105c89a0714086ebc4;hp=7ca346bedcae22a13503f11c1e1366b5b25d5cc3;hpb=efa9ed860628dba98c63b7722f472d922fbe8a87;p=sfa.git

diff --git a/sfa/generic/iotlab.py b/sfa/generic/iotlab.py
index 7ca346be..d5636a7c 100644
--- a/sfa/generic/iotlab.py
+++ b/sfa/generic/iotlab.py
@@ -30,13 +30,8 @@ class iotlab (Generic):
 
     # driver class for server-side services, talk to the whole testbed
     def driver_class (self):
-<<<<<<< HEAD:sfa/generic/slab.py
-        import sfa.managers.v2_to_v3_adapter
-        return sfa.managers.v2_to_v3_adapter.V2ToV3Adapter
-=======
         import sfa.iotlab.iotlabdriver
         return sfa.iotlab.iotlabdriver.IotlabDriver
->>>>>>> 7cb1e78... Renaming Senslab into Iotlab.:sfa/generic/iotlab.py
 
     # iotlab does not have a component manager yet
     # manager class
@@ -44,4 +39,4 @@ class iotlab (Generic):
         return None
     # driver_class
     def component_driver_class (self):
-        return None
+        return None
\ No newline at end of file