This commit is contained in:
Erik Johnston 2015-02-13 14:23:39 +00:00
parent 8c652a2b5f
commit e441c10a73
1 changed files with 1 additions and 1 deletions

View File

@ -878,7 +878,7 @@ class FederationHandler(BaseHandler):
(d.type, d.state_key) for d in different_events
})
new_state, _ = self.state.resolve_events(
new_state, prev_state = self.state.resolve_events(
[local_view, remote_view],
event
)