diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 0eb2ff95ca04b55c9200ffd85f6dcc46d7b0bbbb..7deed16f9caf528252a4cc4c22d1d1066e303aae 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -875,7 +875,7 @@ class FederationHandler(BaseHandler): local_view = dict(auth_events) remote_view = dict(auth_events) remote_view.update({ - (d.type, d.state_key) for d in different_events + (d.type, d.state_key): d for d in different_events }) new_state, prev_state = self.state_handler.resolve_events(