From 68f46e07f2bab943051f46c03912946ade2edea9 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Fri, 15 May 2020 15:14:33 +0100
Subject: Fix sytest CI

* Switch sytest-synapse to sytest-dinsic
* Be sure to invalidate our caches properly!
* Remove duplicate encryption state key definition
* Remove old config option name in comment
* Make dinsic the default in merge_base_branch
---
 synapse/api/constants.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'synapse/api/constants.py')

diff --git a/synapse/api/constants.py b/synapse/api/constants.py
index 42eff8793b..cc8577552b 100644
--- a/synapse/api/constants.py
+++ b/synapse/api/constants.py
@@ -85,7 +85,6 @@ class EventTypes(object):
     RoomAvatar = "m.room.avatar"
     RoomEncryption = "m.room.encryption"
     GuestAccess = "m.room.guest_access"
-    Encryption = "m.room.encryption"
 
     # These are used for validation
     Message = "m.room.message"
-- 
cgit 1.5.1