Skip to content

Commit

Permalink
cleanup merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastianliebscher committed Aug 5, 2023
1 parent 15441ef commit c1d4e4e
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion superset/security/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
# pylint: disable=too-many-lines
"""A set of constants and methods to manage permissions and security"""

import contextlib
import logging
import re
import time
Expand Down

0 comments on commit c1d4e4e

Please sign in to comment.