diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-23 14:36:00 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-23 14:36:00 +0000 |
| commit | e25e0f4da9ac04aab6bcaacef3d2950963f673da (patch) | |
| tree | 4cfd61797f83c9ef7c6c3328faad52797560f313 /synapse/handlers/federation.py | |
| parent | Revert get_auth_chain changes (diff) | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-e25e0f4da9ac04aab6bcaacef3d2950963f673da.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pdu
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 628e62f8b1..ae4e9b316d 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -899,7 +899,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( |