diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-06-11 14:43:55 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-06-11 14:43:55 +0100 |
| commit | d6cc36920504a7527fb9aacfc4e6fd35292455b2 (patch) | |
| tree | 43ed76763e087732626aac63116ce89a2609436c | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-d6cc36920504a7527fb9aacfc4e6fd35292455b2.tar.xz | |
fix idiotic typo in state res
| -rw-r--r-- | synapse/state.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/state.py b/synapse/state.py index 216418f58d..8098db94b4 100644 --- a/synapse/state.py +++ b/synapse/state.py @@ -694,10 +694,10 @@ def _create_auth_events_from_maps(unconflicted_state, conflicted_state, state_ma return auth_events -def _resolve_with_state(unconflicted_state_ids, conflicted_state_ds, auth_event_ids, +def _resolve_with_state(unconflicted_state_ids, conflicted_state_ids, auth_event_ids, state_map): conflicted_state = {} - for key, event_ids in iteritems(conflicted_state_ds): + for key, event_ids in iteritems(conflicted_state_ids): events = [state_map[ev_id] for ev_id in event_ids if ev_id in state_map] if len(events) > 1: conflicted_state[key] = events |