summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-20 16:06:28 +0000
committerErik Johnston <erik@matrix.org>2015-02-20 16:06:28 +0000
commit7367ca42b597f9863819a5dd9fb628273ce71614 (patch)
tree119fb440d82356a352ec007ee0dc09e948a9ce5f /synapse/handlers/federation.py
parentMerge pull request #84 from matrix-org/disable_registration (diff)
parentMerge branch 'hotfixes-v0.7.1-r1' of github.com:matrix-org/synapse (diff)
downloadsynapse-7367ca42b597f9863819a5dd9fb628273ce71614.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r--synapse/handlers/federation.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 0eb2ff95ca..7deed16f9c 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(