dandri/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2026-08-28 20:38:19 +00:00
Code Issues Packages Projects Releases 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
Download Patch File Download Diff File Expand all files Collapse all files
synapse/storage/__init__.py
-3
View File
@@ -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