diff options
Diffstat (limited to 'sites')
| -rw-r--r-- | sites/www/changelog.rst | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 006f6c48..4e4c9b2d 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,7 +2,6 @@ Changelog ========= -<<<<<<< HEAD * :bug:`-` Accidentally merged the new features from 1.18.0 into the 2.0.x bugfix-only branch. This included merging a bug in one of those new features (breaking `~paramiko.client.SSHClient.invoke_shell` with an |