summary refs log tree commit diff
path: root/synapse/storage/databases/main/room.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-08-18 18:13:47 +0100
committerRichard van der Hoff <richard@matrix.org>2020-08-18 18:13:47 +0100
commitafe4c4e02e539861e36d6e080f2f5e33bd58f20d (patch)
treeabdef0313e40eec69fbd5d182cbe05fac44d11ed /synapse/storage/databases/main/room.py
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
parentAdd resources.consent conditional dependency back (#8107) (diff)
downloadsynapse-afe4c4e02e539861e36d6e080f2f5e33bd58f20d.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/storage/databases/main/room.py')
-rw-r--r--synapse/storage/databases/main/room.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/synapse/storage/databases/main/room.py b/synapse/storage/databases/main/room.py

index f4008e6221..aef08c7e12 100644 --- a/synapse/storage/databases/main/room.py +++ b/synapse/storage/databases/main/room.py
@@ -35,10 +35,6 @@ from synapse.util.caches.descriptors import cached logger = logging.getLogger(__name__) -OpsLevel = collections.namedtuple( - "OpsLevel", ("ban_level", "kick_level", "redact_level") -) - RatelimitOverride = collections.namedtuple( "RatelimitOverride", ("messages_per_second", "burst_count") )