diff options
| author | Micah Anderson <micah@riseup.net> | 2013-08-22 15:12:44 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-08-22 15:13:44 -0400 |
| commit | 3d1d5459ee3b262c002cd116ace54ed8d5df8099 (patch) | |
| tree | 465a344ea2e94011f711030807ce06ae803f7013 /src/leap/keymanager/tests/test_keymanager.py | |
| parent | d4c8ce9ced9e416aa800f9deb8af42721d1f5a1c (diff) | |
| parent | 0347bf68d394118460566c8cd5cd49c75b0825f7 (diff) | |
Merge remote-tracking branch 'origin/develop' into debian
Diffstat (limited to 'src/leap/keymanager/tests/test_keymanager.py')
| -rw-r--r-- | src/leap/keymanager/tests/test_keymanager.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/leap/keymanager/tests/test_keymanager.py b/src/leap/keymanager/tests/test_keymanager.py index a474e32..5f232fe 100644 --- a/src/leap/keymanager/tests/test_keymanager.py +++ b/src/leap/keymanager/tests/test_keymanager.py @@ -23,7 +23,7 @@ Tests for the Key Manager. from mock import Mock from leap.common.testing.basetest import BaseLeapTest -from leap.soledad import Soledad +from leap.soledad.client import Soledad from leap.keymanager import ( KeyManager, openpgp, |