summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-07-25 12:23:46 -0300
committerTomás Touceda <chiiph@leap.se>2014-07-25 12:23:46 -0300
commited93cbe97f7898d0759e63f9917f7d001a2e9b78 (patch)
tree4b1458bf5cc901aeb77caec2eea50d7f01c20733 /src/leap
parentac2d0506fff21e30a3e072b85097938322da15ea (diff)
parent89cb09b95f1c45a95c22c9ec99e7ba62fa6dd98b (diff)
Merge remote-tracking branch 'refs/remotes/ivan/bug/fix-import-error' into develop
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/bitmask/util/autostart.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/leap/bitmask/util/autostart.py b/src/leap/bitmask/util/autostart.py
index b8ac02b1..5f003bd8 100644
--- a/src/leap/bitmask/util/autostart.py
+++ b/src/leap/bitmask/util/autostart.py
@@ -17,10 +17,10 @@
"""
Helpers to enable/disable bitmask's autostart.
"""
-import flags
import logging
import os
+from leap.bitmask.config import flags
from leap.bitmask.platform_init import IS_LINUX
logger = logging.getLogger(__name__)