From f646bdee39683cb30a6e30466ac1b49be8358ad5 Mon Sep 17 00:00:00 2001 From: benoitc Date: Mon, 25 Nov 2019 23:15:22 +0100 Subject: [PATCH] fix bad cherry-picking --- docs/source/news.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/source/news.rst b/docs/source/news.rst index 7b9af4c6..0839013d 100644 --- a/docs/source/news.rst +++ b/docs/source/news.rst @@ -14,7 +14,6 @@ Unreleased - fixed `socketfromfd.fromfd` when defaults are not set .. note:: we now warn when we load a config file without Python Extension ->>>>>>> 5257d92... changelog for the 20.0.3 20.0.2 / 2019/11/23 ===================