diff options
| author | Kali Kaneko <kali@leap.se> | 2014-11-03 12:13:46 +0100 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-11-03 12:13:46 +0100 |
| commit | 0fc71d08381c7e750dabc2fc6cf5ef957d51bb5a (patch) | |
| tree | 907c872b37be164b7095fbf97a2d466b59b31b7e /src/leap/bitmask/services/soledad/soledadbootstrapper.py | |
| parent | fa5fe88d47dd3e90d8336dbd56e9bf6b38acd811 (diff) | |
| parent | 7b0dda2fde310fff5ea6ee57a5f18a554b8e665f (diff) | |
Merge tag '0.7.0rc3' into deb-0.7.1-rc3
Tag leap.bitmask version 0.7.0rc3
Conflicts:
src/leap/bitmask/services/soledad/soledadbootstrapper.py
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__) |