Fix wrong variable name
parent
49eb11530c
commit
b11a6e1c3c
|
@ -878,7 +878,7 @@ class FederationHandler(BaseHandler):
|
||||||
(d.type, d.state_key) for d in different_events
|
(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],
|
[local_view, remote_view],
|
||||||
event
|
event
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue