Fix wrong variable name

This commit is contained in:
Erik Johnston 2015-02-13 15:37:18 +00:00
parent 49eb11530c
commit b11a6e1c3c

View File

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