CHANGELOG: fix bad merge

This commit is contained in:
terrafrost 2021-11-28 17:46:03 -06:00
parent bf17f54058
commit 89bfb45bd8

View File

@ -119,7 +119,6 @@
- SSH2: error out when no data is received from the server (#1647) - SSH2: error out when no data is received from the server (#1647)
- SFTP: don't attempt to parse unsupported attributes (#1708) - SFTP: don't attempt to parse unsupported attributes (#1708)
- SFTP: getSupportedVersions() call didn't work - SFTP: getSupportedVersions() call didn't work
>>>>>>> 2.0
## 2.0.34 - 2021-10-26 ## 2.0.34 - 2021-10-26