diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-08-26 16:07:05 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-08-26 16:07:05 +0100 |
| commit | 4b63b06cad3e72e3d3dee66d3d6c7801e4a7abaf (patch) | |
| tree | 37b368d6039d986d70f153fb69d6345d1019d64a /synapse/storage/room.py | |
| parent | fix a few pyflakes errors (diff) | |
| parent | Fix pyflakes errors (diff) | |
| download | synapse-4b63b06cad3e72e3d3dee66d3d6c7801e4a7abaf.tar.xz | |
Merge branch 'develop' into storage_transactions
Conflicts: synapse/api/auth.py synapse/handlers/room.py synapse/storage/__init__.py
Diffstat (limited to 'synapse/storage/room.py')
| -rw-r--r-- | synapse/storage/room.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/storage/room.py b/synapse/storage/room.py index 1ae3220197..d1f1a232f8 100644 --- a/synapse/storage/room.py +++ b/synapse/storage/room.py @@ -18,12 +18,10 @@ from twisted.internet import defer from sqlite3 import IntegrityError from synapse.api.errors import StoreError -from synapse.api.events.room import RoomTopicEvent from ._base import SQLBaseStore, Table import collections -import json import logging logger = logging.getLogger(__name__) |