summaryrefslogtreecommitdiff
path: root/src/leap/soledad
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-05-29 09:59:13 -0300
committerTomás Touceda <chiiph@leap.se>2013-05-29 09:59:13 -0300
commitf0d4db8136a73e41913e79705379a67589eefc90 (patch)
tree110e1ad6e4037dba9a8bce12136797cc18450075 /src/leap/soledad
parentfda0918575e329eb548c0cbca45b0ac3bbe322d2 (diff)
parentd003916e807696c3b3c87c133547c043e0bde455 (diff)
Merge remote-tracking branch 'drebs/bug/remove-uneeded-keymanager-import' into develop
Diffstat (limited to 'src/leap/soledad')
-rw-r--r--src/leap/soledad/backends/leap_backend.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/leap/soledad/backends/leap_backend.py b/src/leap/soledad/backends/leap_backend.py
index 4af2489b..d92025db 100644
--- a/src/leap/soledad/backends/leap_backend.py
+++ b/src/leap/soledad/backends/leap_backend.py
@@ -39,7 +39,6 @@ from leap.common.crypto import (
encrypt_sym,
decrypt_sym,
)
-from leap.common.keymanager import KeyManager
from leap.common.check import leap_assert
from leap.soledad.auth import TokenBasedAuth