From 48c8e7d6037eff0eec55e0986c9868370420ecbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= Date: Thu, 30 May 2013 01:36:56 +0200 Subject: [PATCH] =?UTF-8?q?[lc=5Fldap]=20Putain=20de=20merge=20conflict=20?= =?UTF-8?q?=C3=A0=20la=20con=20que=20j'ai=20mal=20r=C3=A9solu.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lc_ldap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lc_ldap.py b/lc_ldap.py index 674e553..c525098 100644 --- a/lc_ldap.py +++ b/lc_ldap.py @@ -234,7 +234,7 @@ class lc_ldap(ldap.ldapobject.LDAPObject, object): assert isinstance(owner, objets.AssociationCrans) elif realm in ["wifi-adh", "wifi-v6"]: - ldif['objectClass'] = [u'machineWifi'] + uldif['objectClass'] = [u'machineWifi'] assert isinstance(owner, objets.adherent) or isinstance(owner, objets.club) elif realm in ["adherents", "adherents-v6", "personnel-ens"]: