diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-11 12:13:39 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-11 12:13:39 +0200 |
| commit | 7c186a4edbb0c6bc1f471d0db62dfc60008160a2 (patch) | |
| tree | 89fb7e5b14cdfe9a0b61da828ddac8f355a3cdd0 /test/test_utils.py | |
| parent | b62498e125191beca3b49841eb5f1fb9a93a868a (diff) | |
| parent | dd414e485212e3cab612a66d5d858c1a766ace04 (diff) | |
| download | mitmproxy-7c186a4edbb0c6bc1f471d0db62dfc60008160a2.tar.gz mitmproxy-7c186a4edbb0c6bc1f471d0db62dfc60008160a2.tar.bz2 mitmproxy-7c186a4edbb0c6bc1f471d0db62dfc60008160a2.zip | |
Merge branch 'master' into contentviews
Diffstat (limited to 'test/test_utils.py')
| -rw-r--r-- | test/test_utils.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/test/test_utils.py b/test/test_utils.py index 0cda23b4..d2bd97e1 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -1,6 +1,5 @@ import json from libmproxy import utils -from netlib import odict import tutils utils.CERT_SLEEP_TIME = 0 |