mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-09-09 15:11:54 +00:00
Remove merge conflict
This commit is contained in:
parent
4f7fe63b6d
commit
91015ad008
@ -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 New Issue
Block a user