summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-20 14:08:42 +0000
committerErik Johnston <erik@matrix.org>2015-02-20 14:08:42 +0000
commit2bafeca2703635ea1fee2a7617c30cfad1b00315 (patch)
tree2bef1445778e1a69cae679bf52d9507cec2a1a11
parentUpdate CHANGES.rst with missing changes (diff)
downloadsynapse-2bafeca2703635ea1fee2a7617c30cfad1b00315.tar.xz
Add missing comma so that it generates a dict and not a set
-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(