diff options
| author | Leonardo Schäffer <leonardo.schaffer@gmail.com> | 2015-06-25 11:20:44 -0300 |
|---|---|---|
| committer | Leonardo Schäffer <leonardo.schaffer@gmail.com> | 2015-06-25 11:20:44 -0300 |
| commit | 42f31aa607750eb7c00224e7c1c353b27cbd7519 (patch) | |
| tree | 4bbfae731c8427c526f22bacb9136e5ed3e69d8c /service/test/unit/resources | |
| parent | 7f349abe67b8e1a71798478f6c26b08773f2d869 (diff) | |
| parent | 0b179c61043a9854fa23b8fd40fd252864ecd021 (diff) | |
Merge branch 'master' into floatlabel_for_compose
Diffstat (limited to 'service/test/unit/resources')
| -rw-r--r-- | service/test/unit/resources/test_keys_resources.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/service/test/unit/resources/test_keys_resources.py b/service/test/unit/resources/test_keys_resources.py index fb085cad..be79424b 100644 --- a/service/test/unit/resources/test_keys_resources.py +++ b/service/test/unit/resources/test_keys_resources.py @@ -1,4 +1,3 @@ -import json from mockito import mock, when from leap.keymanager import OpenPGPKey, KeyNotFound from pixelated.resources.keys_resource import KeysResource |