diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-26 16:03:56 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-26 16:03:56 +0100 |
| commit | 3df5cb804f0b9a3ca6a5db969a4ac8e8d42685cd (patch) | |
| tree | e8ababe0e0b7beb91e31d6687f1fb6ad10b73193 /synapse/storage/room.py | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor (diff) | |
| parent | Fix pyflakes errors (diff) | |
| download | synapse-3df5cb804f0b9a3ca6a5db969a4ac8e8d42685cd.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
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 22f2dcca45..a5751005ef 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__) |