summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-30 14:58:54 +0000
committerErik Johnston <erik@matrix.org>2015-01-30 14:58:54 +0000
commit91015ad008b0d4538022fbddae7da397f7bd7000 (patch)
tree766c9a589fc9f3b8aa7109b43df51a8984bdd1d2 /synapse/storage
parentRemember to add schema file to list (diff)
downloadsynapse-91015ad008b0d4538022fbddae7da397f7bd7000.tar.xz
Remove merge conflict
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/__init__.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index d03ee80303..f35ece6446 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -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