Fix bad merge of CHANGES.md

This commit is contained in:
Richard van der Hoff 2020-04-08 17:41:46 +01:00
parent 23f8d285eb
commit 24722de7c8

View File

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