resolve_events expect lists, not dicts

2015-02-15 20:20:51 +00:00
parent 2b8903ce2f
commit b99a33f283
1 changed files with 1 additions and 1 deletions
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -879,7 +879,7 @@ class FederationHandler(BaseHandler):
                })

                new_state, prev_state = self.state_handler.resolve_events(
-                    [local_view, remote_view],
+                    [local_view.values(), remote_view.values()],
                    event
                )