From 487066ec9757c3c82e96014d0b30906996c6280d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 14 Mar 2024 17:00:47 -0400
Subject: [PATCH] Merge changelog into last release.

---
 NEWS.rst                     | 6 ++++++
 newsfragments/114.bugfix.rst | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)
 delete mode 100644 newsfragments/114.bugfix.rst

diff --git a/NEWS.rst b/NEWS.rst
index af61017..2084587 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -8,6 +8,12 @@ Features
 - Refactored glob functionality to support a more generalized solution with support for platform-specific path separators. (#108)
 
 
+Bugfixes
+--------
+
+- Add special accounting for pypy when computing the stack level for text encoding warnings. (#114)
+
+
 v3.17.0
 =======
 
diff --git a/newsfragments/114.bugfix.rst b/newsfragments/114.bugfix.rst
deleted file mode 100644
index fb6fc40..0000000
--- a/newsfragments/114.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add special accounting for pypy when computing the stack level for text encoding warnings.
\ No newline at end of file