mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-23 10:05:55 +03:00
Code Issues Projects Releases Packages Wiki Activity

Remove merge conflict

Browse source
This commit is contained in:
Erik Johnston 2015-01-30 14:58:54 +00:00
parent 4f7fe63b6d
commit 91015ad008
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
synapse/storage/__init__.py
View file

@ -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