Fix bad merge of CHANGES.md

matrix-org · Apr 8, 2020 · 24722de · 24722de
1 parent 23f8d28
commit 24722de
Showing 1 changed file with 1 addition and 5 deletions.
diff --git 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)
 ===========================