X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fiotlab%2FLDAPapi.py;h=98a72ec8a1ab2a725b16ca88f07354d191f29601;hb=efa9ed860628dba98c63b7722f472d922fbe8a87;hp=75649e366eae78cc09efa76e2dca7d2481cc9c83;hpb=bc8b1619a3ab4641dc095773214432ecfb1c5513;p=sfa.git

diff --git a/sfa/iotlab/LDAPapi.py b/sfa/iotlab/LDAPapi.py
index 75649e36..98a72ec8 100644
--- a/sfa/iotlab/LDAPapi.py
+++ b/sfa/iotlab/LDAPapi.py
@@ -73,7 +73,6 @@ class ldap_co:
 
     def bind(self):
         """ Binding method.
-
         :return: dictionary with the bind status. True if Successful,
         False if not and in this case the error message( {'bool', 'message'} )
         :rtype: dict
@@ -320,6 +319,7 @@ class LDAPapi :
 
     def LdapGenerateUniqueLogin(self, record):
         """
+<<<<<<< HEAD:sfa/iotlab/LDAPapi.py
 
         Generate login for adding a new user in LDAP Directory
         (four characters minimum length). Get proper last name and