From 4a0aea2debfdd0ed2584221128fed891d0bc727d Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Tue, 14 Nov 2017 22:03:34 -0200
Subject: [PATCH] Add missing entry to CHANGELOG for 3.2.4

---
 CHANGELOG.rst      | 2 ++
 changelog/2836.bug | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)
 delete mode 100644 changelog/2836.bug

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f75e83bbe..026290208 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -28,6 +28,8 @@ Bug Fixes
   failed example in the docstring is < 9. (`#2882
   <https://github.com/pytest-dev/pytest/issues/2882>`_)
 
+- Match fixture paths against actual path segments in order to avoid matching folders which share a prefix.
+  (`#2836 <https://github.com/pytest-dev/pytest/issues/2836>`_)
 
 Improved Documentation
 ----------------------
diff --git a/changelog/2836.bug b/changelog/2836.bug
deleted file mode 100644
index afa1961d7..000000000
--- a/changelog/2836.bug
+++ /dev/null
@@ -1 +0,0 @@
-Match fixture paths against actual path segments in order to avoid matching folders which share a prefix.