From e441c10a7302a3b0ddfa3caa7823fa6f62372f82 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 13 Feb 2015 14:23:39 +0000
Subject: [PATCH] pyflakes

---
 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 5b225ffb5..d667d358a 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -878,7 +878,7 @@ class FederationHandler(BaseHandler):
                     (d.type, d.state_key) for d in different_events
                 })
 
-                new_state, _ = self.state.resolve_events(
+                new_state, prev_state = self.state.resolve_events(
                     [local_view, remote_view],
                     event
                 )