diff options
| author | Zohar Lorberbaum <zlorber@gmail.com> | 2016-03-28 10:06:02 -0700 |
|---|---|---|
| committer | Zohar Lorberbaum <zlorber@gmail.com> | 2016-03-28 10:06:02 -0700 |
| commit | 37483e228fb06a8b8d15a32178eb24e59b9e67c5 (patch) | |
| tree | 2560ba74d35eaeb02a9a116ff10d11bf8adb1314 | |
| parent | 6d16f44ab723ef23a633b175c1cb4575919b07c4 (diff) | |
| download | mitmproxy-37483e228fb06a8b8d15a32178eb24e59b9e67c5.tar.gz mitmproxy-37483e228fb06a8b8d15a32178eb24e59b9e67c5.tar.bz2 mitmproxy-37483e228fb06a8b8d15a32178eb24e59b9e67c5.zip | |
Merge remote-tracking branch 'mitmproxy/master'
Merge with master
| -rw-r--r-- | test/mitmproxy/test_flow_export.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/test/mitmproxy/test_flow_export.py b/test/mitmproxy/test_flow_export.py index d4b25543..c1b14da9 100644 --- a/test/mitmproxy/test_flow_export.py +++ b/test/mitmproxy/test_flow_export.py @@ -391,4 +391,3 @@ class TestIsJson(): headers = Headers(content_type="application/json") j = flow_export.is_json(headers, '{"name": "example", "email": "example@example.com"}') assert isinstance(j, dict) - |