summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2019-06-14 18:42:51 -0400
committerJeff Forcier <jeff@bitprophet.org>2019-06-14 18:42:51 -0400
commitb79a2150d90502c16cc3c9436dc558ae1023713e (patch)
treee4372c3b0a7265cbcedb062e0db30d70e2e1954c
parentf19d8ed2528dfc7bcd96f00fd9dde4199c5ac864 (diff)
parentc253bab909d43195f8d5e4cb5dd207f4bd53467b (diff)
downloadparamiko-b79a2150d90502c16cc3c9436dc558ae1023713e.tar.gz
Merge branch '2.2' into 2.3
-rw-r--r--paramiko/channel.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/paramiko/channel.py b/paramiko/channel.py
index fd61bd65..96381f01 100644
--- a/paramiko/channel.py
+++ b/paramiko/channel.py
@@ -1353,6 +1353,3 @@ class ChannelStderrFile(ChannelFile):
def _write(self, data):
self.channel.sendall_stderr(data)
return len(data)
-
-
-# vim: set shiftwidth=4 expandtab :