Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search

1 files changed, 0 insertions, 2 deletions

diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py

index ae9d227586..b2395b28d1 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -72,8 +72,6 @@ class FederationHandler(BaseHandler):
         self.server_name = hs.hostname
         self.keyring = hs.get_keyring()
 
-        self.lock_manager = hs.get_room_lock_manager()
-
         self.replication_layer.set_handler(self)
 
         # When joining a room we need to queue any events for that room up