diff options
| author | Kegan Dougal <kegan@matrix.org> | 2015-02-02 16:05:34 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2015-02-02 16:05:34 +0000 |
| commit | a006d168c556ca71ad0bbb680c60f1ba170338fb (patch) | |
| tree | 9093ead05bd4f55321dff1e4c43b3b1b7b91aad6 /synapse | |
| parent | Merge branch 'develop' into application-services (diff) | |
| download | synapse-a006d168c556ca71ad0bbb680c60f1ba170338fb.tar.xz | |
Actually merge into develop.
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/storage/__init__.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index 9bbd553dfc..1f207495f6 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -67,12 +67,9 @@ SCHEMAS = [ "event_signatures", "pusher", "media_repository", -<<<<<<< HEAD "application_services" -======= "filtering", "rejections", ->>>>>>> develop ] @@ -92,17 +89,13 @@ class DataStore(RoomMemberStore, RoomStore, RegistrationStore, StreamStore, ProfileStore, FeedbackStore, PresenceStore, TransactionStore, DirectoryStore, KeyStore, StateStore, SignatureStore, -<<<<<<< HEAD - EventFederationStore, MediaRepositoryStore, - ApplicationServiceStore -======= + ApplicationServiceStore, EventFederationStore, MediaRepositoryStore, RejectionsStore, FilteringStore, PusherStore, PushRuleStore ->>>>>>> develop ): def __init__(self, hs): |