From 2a01d29f4b09ea114224b00260a0dd3c7089a857 Mon Sep 17 00:00:00 2001
From: Hadley Wickham <h.wickham@gmail.com>
Date: Thu, 11 Jan 2024 15:11:22 -0600
Subject: [PATCH] Fix merge muck up

---
 NEWS.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/NEWS.md b/NEWS.md
index 7d20577f..75ec458c 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,7 @@
+# withr (development version)
+
+* `@family` lists are now ordered more carefully, "foo1" comes after "foo" (#1563, @krlmlr).
+
 # roxygen2 7.3.0
 
 ## New features