diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2017-04-04 02:26:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-04 02:26:10 +0200 |
| commit | c76620c19f20eb0cac1860a7a3a363bd8d309081 (patch) | |
| tree | bf3e338086d0ae3cc513bacfe48311c4a9962df4 | |
| parent | 8567300dd6222520bbaa1ad12dd39d53ce4f7b67 (diff) | |
| parent | 55ba6ed14db6634598d1dae4a5c3815a459bcffe (diff) | |
| download | mitmproxy-c76620c19f20eb0cac1860a7a3a363bd8d309081.tar.gz mitmproxy-c76620c19f20eb0cac1860a7a3a363bd8d309081.tar.bz2 mitmproxy-c76620c19f20eb0cac1860a7a3a363bd8d309081.zip | |
Merge pull request #2227 from vinaydargar/grammarphrasing
Replace phrase 'the the' in 2 places
| -rw-r--r-- | mitmproxy/tools/web/static/vendor.js | 2 | ||||
| -rw-r--r-- | mitmproxy/version.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mitmproxy/tools/web/static/vendor.js b/mitmproxy/tools/web/static/vendor.js index e83b8ba4..89f0d20c 100644 --- a/mitmproxy/tools/web/static/vendor.js +++ b/mitmproxy/tools/web/static/vendor.js @@ -3208,7 +3208,7 @@ function updateWidgetHeight(line) { } // Compute the lines that are visible in a given viewport (defaults -// the the current scroll position). viewport may contain top, +// to the current scroll position). viewport may contain top, // height, and ensure (see op.scrollToPos) properties. function visibleLines(display, doc, viewport) { var top = viewport && viewport.top != null ? Math.max(0, viewport.top) : display.scroller.scrollTop diff --git a/mitmproxy/version.py b/mitmproxy/version.py index 006ec868..3cae2a04 100644 --- a/mitmproxy/version.py +++ b/mitmproxy/version.py @@ -4,7 +4,7 @@ PATHOD = "pathod " + VERSION MITMPROXY = "mitmproxy " + VERSION # Serialization format version. This is displayed nowhere, it just needs to be incremented by one -# for each change the the file format. +# for each change in the file format. FLOW_FORMAT_VERSION = 5 if __name__ == "__main__": |