fix bad cherry-picking

This commit is contained in:
benoitc 2019-11-25 23:15:22 +01:00
parent 2dae3ea165
commit f646bdee39

View File

@ -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
===================