diff options
| author | Jason <jason.daurus@gmail.com> | 2016-06-17 21:58:24 +0800 |
|---|---|---|
| committer | Jason <jason.daurus@gmail.com> | 2016-06-17 21:58:24 +0800 |
| commit | c82d27b2a215c075dba71254cafdc86e98e0f2d9 (patch) | |
| tree | 84324135951cf67617e4887923bee0627c1d1085 /web/src/js/components/MainView.jsx | |
| parent | 6ad2f13341208b8460eae0dd0105c3109e773bae (diff) | |
| parent | 9c6199db9be34fad18eaedb86463333671ae190a (diff) | |
| download | mitmproxy-c82d27b2a215c075dba71254cafdc86e98e0f2d9.tar.gz mitmproxy-c82d27b2a215c075dba71254cafdc86e98e0f2d9.tar.bz2 mitmproxy-c82d27b2a215c075dba71254cafdc86e98e0f2d9.zip | |
Merge branch 'master' into settings
Conflicts:
mitmproxy/web/static/app.css
mitmproxy/web/static/app.js
web/src/js/components/ProxyApp.jsx
Diffstat (limited to 'web/src/js/components/MainView.jsx')
| -rw-r--r-- | web/src/js/components/MainView.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/src/js/components/MainView.jsx b/web/src/js/components/MainView.jsx index 8c6ed6d0..7064d3bf 100644 --- a/web/src/js/components/MainView.jsx +++ b/web/src/js/components/MainView.jsx @@ -3,9 +3,9 @@ import { connect } from 'react-redux' import { FlowActions } from '../actions.js' import { Query } from '../actions.js' import { Key } from '../utils.js' -import { Splitter } from './common.js' +import Splitter from './common/Splitter' import FlowTable from './FlowTable' -import FlowView from './flowview/index.js' +import FlowView from './FlowView' import { selectFlow, setFilter, setHighlight } from '../ducks/flows' class MainView extends Component { |