diff options
| author | kali <kali@leap.se> | 2013-01-23 00:31:14 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2013-01-23 00:31:14 +0900 |
| commit | 06a1ef47e1719c3987006043fd1aae10e6da5c86 (patch) | |
| tree | 87df182d2f8bea962b427e2f31211e8be0f31a6b /src/leap/soledad/tests/test_encrypted.py | |
| parent | 54802bf9c53fc32cfcceb23045c5aeb313c19829 (diff) | |
| parent | 3359370d9ae06ffc0d60930e7f997d2331dc9037 (diff) | |
Merge branch 'develop' of ssh://leap.se/leap_client into develop
Diffstat (limited to 'src/leap/soledad/tests/test_encrypted.py')
| -rw-r--r-- | src/leap/soledad/tests/test_encrypted.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/leap/soledad/tests/test_encrypted.py b/src/leap/soledad/tests/test_encrypted.py index 4ee03a3c..8cb6dc51 100644 --- a/src/leap/soledad/tests/test_encrypted.py +++ b/src/leap/soledad/tests/test_encrypted.py @@ -1,8 +1,3 @@ -try: - import simplejson as json -except ImportError: - import json # noqa - import unittest2 as unittest import os |