diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-12-12 15:45:34 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-12-12 15:45:34 -0800 |
| commit | 82e6561280bde8462142ebedc837d7a84fbba911 (patch) | |
| tree | 0502e7b82ee70451a23dd7a72d50f5bfa5b54a09 /sites/www/changelog.rst | |
| parent | 3a68759d6f93a525d0067013c4a13f638faad9f6 (diff) | |
GRUMP
Diffstat (limited to 'sites/www/changelog.rst')
| -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 |