From 6dc517584fcbd63cc612cd26d0a43ea92dd6730e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 15 Apr 2020 12:56:33 +0200
Subject: [PATCH] Fix merge issue

---
 CHANGES.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index e8d68d0181..240203b2c9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,8 +10,6 @@ Features ✨:
 Improvements 🙌:
  - Verification DM / Handle concurrent .start after .ready (#794)
  - Reimplementation of multiple attachment picker
- - CrossSigning / Update Shield Logic for DM (#963)
- - Xsigning | Complete security new session design update (#1135)
  - Cross-Signing | Update Shield Logic for DM (#963)
  - Cross-Signing | Complete security new session design update (#1135)
  - Cross-Signing | Setup key backup as part of SSSS bootstrapping (#1201)