mirror of
https://github.com/element-hq/synapse
synced 2024-09-06 01:50:08 +00:00
Remove merge conflict
This commit is contained in:
parent
4f7fe63b6d
commit
91015ad008
1 changed files with 0 additions and 3 deletions
|
@ -32,11 +32,8 @@ from .event_federation import EventFederationStore
|
|||
from .pusher import PusherStore
|
||||
from .push_rule import PushRuleStore
|
||||
from .media_repository import MediaRepositoryStore
|
||||
<<<<<<< HEAD
|
||||
from .rejections import RejectionsStore
|
||||
|
||||
=======
|
||||
>>>>>>> 471c47441d0c188e845b75c8f446c44899fdcfe7
|
||||
from .state import StateStore
|
||||
from .signatures import SignatureStore
|
||||
from .filtering import FilteringStore
|
||||
|
|
Loading…
Reference in a new issue