Finalize

jaraco · Dec 4, 2023 · 2f079b2 · 2f079b2
1 parent cc13800
commit 2f079b2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/NEWS.rst b/NEWS.rst
@@ -1,3 +1,12 @@
+v8.5.0
+======
+
+Features
+--------
+
+- Update merge resolver to re-substitute placeholders to honor upstream changes.
+
+
 v8.4.0
 ======
 

diff --git a/newsfragments/+66c1d16a.feature.rst b/newsfragments/+66c1d16a.feature.rst