diff options
| author | Kali Kaneko <kali@leap.se> | 2014-11-10 16:14:55 +0100 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-11-10 16:14:55 +0100 |
| commit | 7c706da38fffc4fbbbc108d2f4c5fe98ba31f18a (patch) | |
| tree | f253f2ae9ad01173fcd3d6858b1cda1227593511 /src/leap/bitmask/services/soledad/soledadbootstrapper.py | |
| parent | fa5fe88d47dd3e90d8336dbd56e9bf6b38acd811 (diff) | |
| parent | 7f393dbb940e7cbc77406369c57c7ded52765f4b (diff) | |
Merge branch 'deb-0.7.1-rc4' into debian
Diffstat (limited to 'src/leap/bitmask/services/soledad/soledadbootstrapper.py')
| -rw-r--r-- | src/leap/bitmask/services/soledad/soledadbootstrapper.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py index 02ad9403..c4e43bfe 100644 --- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py +++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py @@ -45,8 +45,7 @@ from leap.common.files import which from leap.keymanager import KeyManager, openpgp from leap.keymanager.errors import KeyNotFound from leap.soledad.common.errors import InvalidAuthTokenError -from leap.soledad.client import Soledad -from leap.soledad.client import BootstrapSequenceError +from leap.soledad.client import Soledad, BootstrapSequenceError logger = logging.getLogger(__name__) |