summaryrefslogtreecommitdiffhomepage
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
commit0dcd9111bfc16c894d4555696093fa3a39d9aad0 (patch)
tree71dbf7daa2c33c42843445da493dfab4a885b84c
parenta0debff14471efe636780a9af50d421db9963ab5 (diff)
parentc4e83b11c9d330c5f6ecdc27fb566482c855a2a7 (diff)
Merge branch '2.4' into 2.5
-rw-r--r--paramiko/channel.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/paramiko/channel.py b/paramiko/channel.py
index faf35763..f2aaf26a 100644
--- a/paramiko/channel.py
+++ b/paramiko/channel.py
@@ -1354,6 +1354,3 @@ class ChannelStderrFile(ChannelFile):
def _write(self, data):
self.channel.sendall_stderr(data)
return len(data)
-
-
-# vim: set shiftwidth=4 expandtab :