diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-08-06 10:52:50 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2020-08-06 10:52:50 +0100 |
| commit | 118a9eafb31fbd51d23ef8abbaac481579b7f9e5 (patch) | |
| tree | ba84cd874fbe43c4981abaa3d8aa2c9913d5097b /synapse/replication/slave/storage/keys.py | |
| parent | Incorporate review (diff) | |
| parent | Fixup worker doc (again) (#8000) (diff) | |
| download | synapse-118a9eafb31fbd51d23ef8abbaac481579b7f9e5.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/new_push_rules
Diffstat (limited to 'synapse/replication/slave/storage/keys.py')
| -rw-r--r-- | synapse/replication/slave/storage/keys.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/replication/slave/storage/keys.py b/synapse/replication/slave/storage/keys.py index 3def367ae9..961579751c 100644 --- a/synapse/replication/slave/storage/keys.py +++ b/synapse/replication/slave/storage/keys.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from synapse.storage.data_stores.main.keys import KeyStore +from synapse.storage.databases.main.keys import KeyStore # KeyStore isn't really safe to use from a worker, but for now we do so and hope that # the races it creates aren't too bad. |