From 82e6561280bde8462142ebedc837d7a84fbba911 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Mon, 12 Dec 2016 15:45:34 -0800 Subject: GRUMP --- sites/www/changelog.rst | 1 - 1 file changed, 1 deletion(-) 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 -- cgit v1.2.3