summary refs log tree commit diff
path: root/synapse/storage/__init__.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-06-22 16:35:10 +0100
committerRichard van der Hoff <richard@matrix.org>2018-06-22 16:35:10 +0100
commit1d009013b3c3e814177afc59f066e02a202b21cd (patch)
tree798478eec865dc44d7a203bd0423026ebf1710be /synapse/storage/__init__.py
parentMerge pull request #3435 from matrix-org/rav/fix_event_push_actions_tablescan (diff)
downloadsynapse-1d009013b3c3e814177afc59f066e02a202b21cd.tar.xz
Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibility"
This reverts commit ce0d911156b355c5bf452120bfb08653dad96497, reversing
changes made to b4a5d767a94f1680d07edfd583aae54ce422573e.
Diffstat (limited to 'synapse/storage/__init__.py')
-rw-r--r--synapse/storage/__init__.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index e843b702b9..979fa22438 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -20,7 +20,6 @@ import time
 import logging
 
 from synapse.storage.devices import DeviceStore
-from synapse.storage.user_erasure_store import UserErasureStore
 from .appservice import (
     ApplicationServiceStore, ApplicationServiceTransactionStore
 )
@@ -89,7 +88,6 @@ class DataStore(RoomMemberStore, RoomStore,
                 DeviceInboxStore,
                 UserDirectoryStore,
                 GroupServerStore,
-                UserErasureStore,
                 ):
 
     def __init__(self, db_conn, hs):