Merge remote-tracking branch 'origin/develop' into shhs shhs-v1.1.1

1 files changed, 1 insertions, 1 deletions

diff --git a/tests/patch_inline_callbacks.py b/tests/patch_inline_callbacks.py

index ee0add3455..220884311c 100644
--- a/tests/patch_inline_callbacks.py
+++ b/tests/patch_inline_callbacks.py
@@ -28,7 +28,7 @@ def do_patch():
     Patch defer.inlineCallbacks so that it checks the state of the logcontext on exit
     """
 
-    from synapse.util.logcontext import LoggingContext
+    from synapse.logging.context import LoggingContext
 
     orig_inline_callbacks = defer.inlineCallbacks