mirror of
https://github.com/element-hq/synapse
synced 2024-09-04 00:50:10 +00:00
Actually merge into develop.
This commit is contained in:
parent
c059c9fea5
commit
a006d168c5
1 changed files with 1 additions and 8 deletions
|
@ -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):
|
||||
|
|
Loading…
Reference in a new issue