diff options
| author | Erik Johnston <erik@matrix.org> | 2018-08-20 14:21:12 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-08-20 14:48:53 +0100 |
| commit | 8dee601054089311b81efd6239b458401da063e3 (patch) | |
| tree | 19c6986687cd8a57f69d5f35ec4fc1d87065fd80 /synapse/handlers | |
| parent | Revert spurious change (diff) | |
| download | synapse-8dee601054089311b81efd6239b458401da063e3.tar.xz | |
Remove redundant room_version checks
Diffstat (limited to 'synapse/handlers')
| -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 75a819dd11..14a10c1229 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1814,7 +1814,7 @@ class FederationHandler(BaseHandler): room_version = yield self.store.get_room_version(event.room_id) - new_state = yield self.state_handler.resolve_events( + new_state = self.state_handler.resolve_events( room_version, [list(local_view.values()), list(remote_view.values())], event |