diff options
Diffstat (limited to 'ipalib/plugins')
| -rw-r--r-- | ipalib/plugins/f_user.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ipalib/plugins/f_user.py b/ipalib/plugins/f_user.py index e95ee3b2..a1078fe7 100644 --- a/ipalib/plugins/f_user.py +++ b/ipalib/plugins/f_user.py @@ -154,9 +154,10 @@ class user_add(crud.Add): # some required objectclasses kw['objectClass'] = config.get('ipauserobjectclasses') +<<<<<<< HEAD:ipalib/plugins/f_user.py +======= return ldap.create(**kw) - def output_for_cli(self, ret): """ Output result of this command to command line interface. |