From b99a33f283d595f5f462ab039d672ca04bdffcb8 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Sun, 15 Feb 2015 20:20:51 +0000
Subject: resolve_events expect lists, not dicts

---
 synapse/handlers/federation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 4cd795e202..3aecc1ca51 100644
--- 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
                 )
 
-- 
cgit 1.4.1