Skip to content
Snippets Groups Projects
Commit 91015ad0 authored by Erik Johnston's avatar Erik Johnston
Browse files

Remove merge conflict

parent 4f7fe63b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
synapse/storage/__init__.py
+ 0
− 3
View file @ 91015ad0
...@@ -32,11 +32,8 @@ from .event_federation import EventFederationStore ...@@ -32,11 +32,8 @@ from .event_federation import EventFederationStore
from .pusher import PusherStore from .pusher import PusherStore
from .push_rule import PushRuleStore from .push_rule import PushRuleStore
from .media_repository import MediaRepositoryStore from .media_repository import MediaRepositoryStore
<<<<<<< HEAD
from .rejections import RejectionsStore from .rejections import RejectionsStore
=======
>>>>>>> 471c47441d0c188e845b75c8f446c44899fdcfe7
from .state import StateStore from .state import StateStore
from .signatures import SignatureStore from .signatures import SignatureStore
from .filtering import FilteringStore from .filtering import FilteringStore
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment