From 37483e228fb06a8b8d15a32178eb24e59b9e67c5 Mon Sep 17 00:00:00 2001 From: Zohar Lorberbaum Date: Mon, 28 Mar 2016 10:06:02 -0700 Subject: [PATCH] Merge remote-tracking branch 'mitmproxy/master' Merge with master --- test/mitmproxy/test_flow_export.py | 1 - 1 file changed, 1 deletion(-) diff --git a/test/mitmproxy/test_flow_export.py b/test/mitmproxy/test_flow_export.py index d4b255439..c1b14da9e 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) -