From 34152445cff55ca0eb66a896d23b2fdf2677e9da Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Sun, 4 Nov 2018 18:25:16 +0100
Subject: [PATCH] doc: add lost changelog entry

Closes https://github.com/pytest-dev/pytest/issues/4300.

[ci skip]
---
 CHANGELOG.rst       | 2 ++
 doc/4266.bugfix.rst | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)
 delete mode 100644 doc/4266.bugfix.rst

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index eef3b42e9..b604cf1f5 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -60,6 +60,8 @@ Bug Fixes
 - `#611 <https://github.com/pytest-dev/pytest/issues/611>`_: Naming a fixture ``request`` will now raise a warning: the ``request`` fixture is internal and
   should not be overwritten as it will lead to internal errors.
 
+- `#4266 <https://github.com/pytest-dev/pytest/issues/4266>`_: Handle (ignore) exceptions raised during collection, e.g. with Django's LazySettings proxy class.
+
 
 
 Improved Documentation
diff --git a/doc/4266.bugfix.rst b/doc/4266.bugfix.rst
deleted file mode 100644
index f19a7cc1f..000000000
--- a/doc/4266.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Handle (ignore) exceptions raised during collection, e.g. with Django's LazySettings proxy class.