summary refs log tree commit diff
path: root/tests/test_test_utils.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-07-10 18:04:03 +0100
committerRichard van der Hoff <richard@matrix.org>2018-07-10 18:04:03 +0100
commitf04e35c17001171df58ace4fed63772d8101d7fc (patch)
tree11424fdd20122c014262283d4401c84ffbcd9978 /tests/test_test_utils.py
parentMerge branch 'develop' of git+ssh://github.com/matrix-org/synapse into matrix... (diff)
parents/becuase/because/g (diff)
downloadsynapse-f04e35c17001171df58ace4fed63772d8101d7fc.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'tests/test_test_utils.py')
-rw-r--r--tests/test_test_utils.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/test_test_utils.py b/tests/test_test_utils.py

index d28bb726bb..bc97c12245 100644 --- a/tests/test_test_utils.py +++ b/tests/test_test_utils.py
@@ -14,7 +14,6 @@ # limitations under the License. from tests import unittest - from tests.utils import MockClock