diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-06 10:16:15 -0500 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-06 10:16:15 -0500 |
| commit | 61ee72517c96d1b25746e4baea0febcc63b405fd (patch) | |
| tree | 9f8ceaab60e8dce7515b3f4f47f9b9948fe02a1c /synapse | |
| parent | Add third party invites to auth_events for joins (diff) | |
| download | synapse-61ee72517c96d1b25746e4baea0febcc63b405fd.tar.xz | |
Remove merge thinko
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/handlers/_base.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py index 59c86187a9..faf99f5bd3 100644 --- a/synapse/handlers/_base.py +++ b/synapse/handlers/_base.py @@ -134,10 +134,6 @@ class BaseHandler(object): event ) - (event_stream_id, max_stream_id) = yield self.store.persist_event( - event, context=context - ) - federation_handler = self.hs.get_handlers().federation_handler if event.type == EventTypes.Member: |