Merge pull request #3737 from matrix-org/erikj/remove_redundant_state_func

Remove unnecessary resolve_events_with_state_map

1 files changed, 1 insertions, 1 deletions

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

index 0ebf0fd188..3fa7a98445 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -1831,7 +1831,7 @@ class FederationHandler(BaseHandler):
 
                 room_version = yield self.store.get_room_version(event.room_id)
 
-                new_state = self.state_handler.resolve_events(
+                new_state = yield self.state_handler.resolve_events(
                     room_version,
                     [list(local_view.values()), list(remote_view.values())],
                     event