diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2018-09-17 17:59:31 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2018-09-17 17:59:31 -0700 |
| commit | 66ed28838f2887cce377d3e337fa46474b12d501 (patch) | |
| tree | 41a0b4f9423b88ef149e75870f9838900ba9e21c | |
| parent | 4cc767f5cd109a459571abbf21c68b783ce237c9 (diff) | |
| download | paramiko-66ed28838f2887cce377d3e337fa46474b12d501.tar.gz | |
Missed a spot
| -rw-r--r-- | tests/test_client.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/test_client.py b/tests/test_client.py index f3f07124..35756893 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -41,16 +41,10 @@ from .util import _support, slow FINGERPRINTS = { -<<<<<<< HEAD 'ssh-dss': b'\x44\x78\xf0\xb9\xa2\x3c\xc5\x18\x20\x09\xff\x75\x5b\xc1\xd2\x6c', 'ssh-rsa': b'\x60\x73\x38\x44\xcb\x51\x86\x65\x7f\xde\xda\xa2\x2b\x5a\x57\xd5', 'ecdsa-sha2-nistp256': b'\x25\x19\xeb\x55\xe6\xa1\x47\xff\x4f\x38\xd2\x75\x6f\xa5\xd5\x60', 'ssh-ed25519': b'\xb3\xd5"\xaa\xf9u^\xe8\xcd\x0e\xea\x02\xb9)\xa2\x80', -======= - "ssh-dss": b"\x44\x78\xf0\xb9\xa2\x3c\xc5\x18\x20\x09\xff\x75\x5b\xc1\xd2\x6c", - "ssh-rsa": b"\x60\x73\x38\x44\xcb\x51\x86\x65\x7f\xde\xda\xa2\x2b\x5a\x57\xd5", - "ecdsa-sha2-nistp256": b"\x25\x19\xeb\x55\xe6\xa1\x47\xff\x4f\x38\xd2\x75\x6f\xa5\xd5\x60", ->>>>>>> 2.1 } |