diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-11-01 21:31:46 +1100 |
|---|---|---|
| committer | Amber Brown <hawkowl@atleastfornow.net> | 2018-11-01 21:31:46 +1100 |
| commit | 907e6da5be20523bd1d0a14c196289a73182aa65 (patch) | |
| tree | 30e700dadabd415c169c3850aaf73aef817ef7e2 /synapse/state/v1.py | |
| parent | Merge pull request #4072 from steamp0rt/patch-1 (diff) | |
| parent | changelog (diff) | |
| download | synapse-907e6da5be20523bd1d0a14c196289a73182aa65.tar.xz | |
Merge branch 'release-v0.33.8'
Diffstat (limited to 'synapse/state/v1.py')
| -rw-r--r-- | synapse/state/v1.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/state/v1.py b/synapse/state/v1.py index 7a7157b352..70a981f4a2 100644 --- a/synapse/state/v1.py +++ b/synapse/state/v1.py @@ -31,7 +31,7 @@ POWER_KEY = (EventTypes.PowerLevels, "") @defer.inlineCallbacks -def resolve_events_with_factory(state_sets, event_map, state_map_factory): +def resolve_events_with_store(state_sets, event_map, state_map_factory): """ Args: state_sets(list): List of dicts of (type, state_key) -> event_id, |