From 020ff1afe33bfcca89ad78a941c7e2334e93c621 Mon Sep 17 00:00:00 2001
From: "H. Shay" <hillerys@element.io>
Date: Wed, 23 Aug 2023 09:36:34 -0700
Subject: [PATCH] fix changelog

---
 CHANGES.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 33a1b808a6..bc0d4fe8c8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -62,7 +62,6 @@
 * Bump types-pillow from 10.0.0.1 to 10.0.0.2. ([\#16105](https://github.com/matrix-org/synapse/issues/16105))
 * Bump types-pyopenssl from 23.2.0.1 to 23.2.0.2. ([\#16146](https://github.com/matrix-org/synapse/issues/16146))
 
->>>>>>> Stashed changes
 # Synapse 1.90.0 (2023-08-15)
 
 No significant changes since 1.90.0rc1.