diff options
| author | Erik Johnston <erikj@jki.re> | 2018-09-03 16:19:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-03 16:19:41 +0100 |
| commit | 567363e49766c39eb85445b0365463f7eafebe2e (patch) | |
| tree | ba5f546e75e20b2054944946d67353baafcdd039 /synapse/handlers/federation.py | |
| parent | Merge pull request #3378 from NickEckardt/develop (diff) | |
| parent | Newsfile (diff) | |
| download | synapse-567363e49766c39eb85445b0365463f7eafebe2e.tar.xz | |
Merge pull request #3737 from matrix-org/erikj/remove_redundant_state_func
Remove unnecessary resolve_events_with_state_map
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 2 |
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 |