Incorporate changelog of #10433

2 files changed, 1 insertions, 1 deletions

diff --git a/CHANGES.md b/CHANGES.md

index 871b8d8b94..066f798a95 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,6 +15,7 @@ Features
 Bugfixes
 --------
 
+- Fix error while dropping locks on shutdown. Introduced in v1.38.0. ([\#10433](https://github.com/matrix-org/synapse/issues/10433))
 - Add base starting insertion event when no chunk ID is specified in the historical batch send API. ([\#10250](https://github.com/matrix-org/synapse/issues/10250))
 - Fix historical batch send endpoint (MSC2716) rejecting batches with messages from multiple senders. ([\#10276](https://github.com/matrix-org/synapse/issues/10276))
 - Fix purging rooms that other homeservers are still sending events for. Contributed by @ilmari. ([\#10317](https://github.com/matrix-org/synapse/issues/10317))
diff --git a/changelog.d/10433.bugfix b/changelog.d/10433.bugfix
deleted file mode 100644

index ad85a83f96..0000000000
--- a/changelog.d/10433.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix error while dropping locks on shutdown. Introduced in v1.38.0.