Fixing stupid bug in Ldap

[sfa.git] / sfa / iotlab / LDAPapi.py

diff --git a/sfa/iotlab/LDAPapi.py b/sfa/iotlab/LDAPapi.py
index 75649e3..98a72ec 100644 (file)
--- 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