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
commitc253bab909d43195f8d5e4cb5dd207f4bd53467b (patch)
tree1114731bd597f2681123bc145893dac186187982
parent3f841c8087af1e573fcf6be1b05c734dda565d59 (diff)
parentc7265b2993c399c6c2820fb01a2b4e7506b703ed (diff)
downloadparamiko-c253bab909d43195f8d5e4cb5dd207f4bd53467b.tar.gz
Merge branch '2.1' into 2.2
-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 :