From a6b3e4612812a3cb78f18d75a7b65e48df8a7260 Mon Sep 17 00:00:00 2001
From: Tak Wai Wong <64229756+tak-hntlabs@users.noreply.github.com>
Date: Sat, 13 Aug 2022 16:09:49 -0700
Subject: [PATCH] Pull latest dendrite fork into harmony (#252)

Latest dendrite main has changes for knockable rooms, and the fix for login crash. Pulled into dendrite fork. Rebased dendrite fork from dendrite main.

Co-authored-by: Till <2353100+S7evinK@users.noreply.github.com>
Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
Co-authored-by: kegsay <kegan@matrix.org>
Co-authored-by: Tak Wai Wong <tak@hntlabs.com>
Co-authored-by: texuf <texuf.eth@gmail.com>
Co-authored-by: Brian Meek <brian@hntlabs.com>
Co-authored-by: Tak Wai Wong <takwaiw@gmail.com>
---
 setup/mscs/msc2946/msc2946.go | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/setup/mscs/msc2946/msc2946.go b/setup/mscs/msc2946/msc2946.go
index 015ba4516..a92a16a27 100644
--- a/setup/mscs/msc2946/msc2946.go
+++ b/setup/mscs/msc2946/msc2946.go
@@ -45,9 +45,6 @@ const (
 	ConstCreateEventContentValueSpace = "m.space"
 	ConstSpaceChildEventType          = "m.space.child"
 	ConstSpaceParentEventType         = "m.space.parent"
-	ConstJoinRulePublic               = "public"
-	ConstJoinRuleKnock                = "knock"
-	ConstJoinRuleRestricted           = "restricted"
 )
 
 type MSC2946ClientResponse struct {