summary refs log tree commit diff
path: root/tests/test_test_utils.py
diff options
context:
space:
mode:
authorWill Hunt <will@half-shot.uk>2018-07-09 13:31:21 +0000
committerGitHub <noreply@github.com>2018-07-09 13:31:21 +0000
commita7f4ebbd3e786ce2e156127a3806aa2594233542 (patch)
treec73795182b60fcc17a5e5b13864eb84758d96c29 /tests/test_test_utils.py
parent/limits => /config (diff)
parentMerge pull request #3464 from matrix-org/hawkowl/isort-run (diff)
downloadsynapse-a7f4ebbd3e786ce2e156127a3806aa2594233542.tar.xz
Merge branch 'develop' into hs/upload-limits
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