diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-13 15:46:42 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-13 15:46:42 +0000 |
| commit | 650dc7f0f905629c658d0ac4ab1be94c4498d148 (patch) | |
| tree | 6ba1902569c278db7958379781e8e195fd70ad35 /synapse/handlers | |
| parent | Merge pull request #50 from matrix-org/application-services (diff) | |
| parent | Bump version (diff) | |
| download | synapse-650dc7f0f905629c658d0ac4ab1be94c4498d148.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/federation.py | 2 |
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 ) |