summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-13 15:37:18 +0000
committerErik Johnston <erik@matrix.org>2015-02-13 15:37:18 +0000
commitb11a6e1c3ca51e81b911fa733a4169bd6cbaa5ee (patch)
tree51dd1020f17f6aedc293fd47e413e79a3e4e342b
parentMerge branch 'develop' of github.com:matrix-org/synapse (diff)
downloadsynapse-b11a6e1c3ca51e81b911fa733a4169bd6cbaa5ee.tar.xz
Fix wrong variable name
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 d667d358ab..4cd795e202 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, prev_state = self.state.resolve_events(
+                new_state, prev_state = self.state_handler.resolve_events(
                     [local_view, remote_view],
                     event
                 )