summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-13 14:23:39 +0000
committerErik Johnston <erik@matrix.org>2015-02-13 14:23:39 +0000
commite441c10a7302a3b0ddfa3caa7823fa6f62372f82 (patch)
tree4f52989565dcfa53d184b28064bcc919bcbf6a4b
parentWhen we see a difference in current state, actually use state conflict resolu... (diff)
downloadsynapse-e441c10a7302a3b0ddfa3caa7823fa6f62372f82.tar.xz
pyflakes
Diffstat (limited to '')
-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 5b225ffb57..d667d358ab 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
                 )