diff options
| author | Matthew Shao <me@matshao.com> | 2017-07-26 15:32:49 +0800 |
|---|---|---|
| committer | Matthew Shao <me@matshao.com> | 2017-07-26 15:32:49 +0800 |
| commit | 6ae0f07e704caf4e855ffe6aa407b1ab8a666e18 (patch) | |
| tree | 7727b3e8e632bb87c4b6b97291dc01edd172e67a /mitmproxy/tools | |
| parent | 4282dc1ac4053d774b0fe6993ae15222fcfe3b3d (diff) | |
| download | mitmproxy-6ae0f07e704caf4e855ffe6aa407b1ab8a666e18.tar.gz mitmproxy-6ae0f07e704caf4e855ffe6aa407b1ab8a666e18.tar.bz2 mitmproxy-6ae0f07e704caf4e855ffe6aa407b1ab8a666e18.zip | |
[web] Fix conflict.
Diffstat (limited to 'mitmproxy/tools')
| -rw-r--r-- | mitmproxy/tools/web/app.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mitmproxy/tools/web/app.py b/mitmproxy/tools/web/app.py index f9f44162..6552a3a1 100644 --- a/mitmproxy/tools/web/app.py +++ b/mitmproxy/tools/web/app.py @@ -21,7 +21,8 @@ from mitmproxy import optmanager from mitmproxy import options import mitmproxy.tools.web.master # noqa -CONFIG_PATH = os.path.expanduser(os.path.join(options.CA_DIR, 'config.yaml')) +CONFIG_PATH = os.path.join(options.CA_DIR, 'config.yaml') + def flow_to_json(flow: mitmproxy.flow.Flow) -> dict: """ |