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
commitc7265b2993c399c6c2820fb01a2b4e7506b703ed (patch)
tree52e22b71430825c82078050bd8e6ec3c436793b2
parent61e19a1da57e7d19959d26f71f895abd6cb0647c (diff)
parent4bec6b3c9eb79f55b5ba5ed455f72a9fae317287 (diff)
downloadparamiko-c7265b2993c399c6c2820fb01a2b4e7506b703ed.tar.gz
Merge branch '2.0' into 2.1
-rw-r--r--paramiko/channel.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/paramiko/channel.py b/paramiko/channel.py
index b2e8edd1..c5b39e9e 100644
--- a/paramiko/channel.py
+++ b/paramiko/channel.py
@@ -1351,6 +1351,3 @@ class ChannelStderrFile(ChannelFile):
def _write(self, data):
self.channel.sendall_stderr(data)
return len(data)
-
-
-# vim: set shiftwidth=4 expandtab :