Skip to content

Commit

Permalink
fix merge conflicts p2
Browse files Browse the repository at this point in the history
  • Loading branch information
afourmy committed Oct 19, 2021
1 parent f48cb55 commit 8c2a481
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions eNMS/models/administration.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ def update(self, **kwargs):
):
kwargs["password"] = argon2.hash(kwargs["password"])
super().update(**kwargs)
if not kwargs.get("import_mechanism", False):
self.update_rbac()


class Access(AbstractBase):
Expand Down

0 comments on commit 8c2a481

Please sign in to comment.