diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-05-30 11:12:19 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-05-30 11:12:19 -0300 |
| commit | 014b10ffae521f3abbf7d38c6700bbacf2712134 (patch) | |
| tree | 57c0dc366cb3e426bf6d13166a4f7b68a7c8d042 /src/leap/bitmask/services | |
| parent | 3477cc811fab50268ab6b9427e632253c3e7e1d1 (diff) | |
| parent | d4d6b0c5476b45629d632debe4527f9d6cb3cb0e (diff) | |
Merge remote-tracking branch 'chiiph/bug/openvpn_not_found' into develop
Diffstat (limited to 'src/leap/bitmask/services')
| -rw-r--r-- | src/leap/bitmask/services/eip/conductor.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/leap/bitmask/services/eip/conductor.py b/src/leap/bitmask/services/eip/conductor.py index 0cd4c95c..53b1fde9 100644 --- a/src/leap/bitmask/services/eip/conductor.py +++ b/src/leap/bitmask/services/eip/conductor.py @@ -26,7 +26,6 @@ from leap.bitmask.services import EIP_SERVICE from leap.bitmask.services import get_service_display_name from leap.bitmask.services.eip.connection import EIPConnection from leap.bitmask.platform_init import IS_MAC -from leap.bitmask.util import make_address QtDelayedCall = QtCore.QTimer.singleShot logger = logging.getLogger(__name__) |