From 24722de7c86408053551dcd0bb9fb1c5397a9c0d Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 8 Apr 2020 17:41:46 +0100
Subject: [PATCH] Fix bad merge of CHANGES.md

---
 CHANGES.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index bee4d6baba..96021a5e69 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,14 +15,10 @@ correctly fix the issue with building the Debian packages. ([\#7212](https://git
 Synapse 1.12.2 (2020-04-02)
 ===========================
 
-This release works around [an
-issue](https://github.com/matrix-org/synapse/issues/7208) with building the
-debian packages.
+This release works around [an issue](https://github.com/matrix-org/synapse/issues/7208) with building the debian packages.
 
 No other significant changes since 1.12.1.
 
->>>>>>> master
-
 Synapse 1.12.1 (2020-04-02)
 ===========================