diff options
| author | Olle Lundberg <geek@nerd.sh> | 2013-02-28 12:51:00 +0100 |
|---|---|---|
| committer | Olle Lundberg <geek@nerd.sh> | 2013-02-28 12:51:00 +0100 |
| commit | 732417bf988228811943873bc7cab29e425847bc (patch) | |
| tree | 561291c60e701f009e61fbaa1b368e1462b69772 | |
| parent | 06f970482060c707d210561159c3d9e5ba5a5f1f (diff) | |
| parent | a07a339006259eb7ad60993415493d2d25a760d3 (diff) | |
Merge branch 'openssh-compatibility' of github.com:lndbrg/paramiko into openssh-compatibility
Conflicts:
paramiko/config.py
tests/test_util.py
| -rw-r--r-- | paramiko/config.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/paramiko/config.py b/paramiko/config.py index e41bae43..8e45ad55 100644 --- a/paramiko/config.py +++ b/paramiko/config.py @@ -74,7 +74,6 @@ class LazyFqdn(object): self.fqdn = fqdn return self.fqdn - class SSHConfig (object): """ Representation of config information as stored in the format used by |