summary refs log tree commit diff
path: root/tests/rest/client
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-12-04 14:29:03 +0000
committerBrendan Abolivier <babolivier@matrix.org>2019-12-04 14:29:03 +0000
commitaeda1b3b94296aac2a2d92dff6f23cf13fe3b4fa (patch)
tree31f509920cdd52a1716da36ae7cf4c7e3be18bdb /tests/rest/client
parentMerge branch 'develop' into babolivier/context_filters (diff)
parentMerge branch 'develop' into babolivier/context_filters (diff)
downloadsynapse-aeda1b3b94296aac2a2d92dff6f23cf13fe3b4fa.tar.xz
Merge branch 'babolivier/context_filters' of github.com:matrix-org/synapse into babolivier/context_filters
Diffstat (limited to 'tests/rest/client')
-rw-r--r--tests/rest/client/v1/test_rooms.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/rest/client/v1/test_rooms.py b/tests/rest/client/v1/test_rooms.py
index ea4b58d37a..4095e63aef 100644
--- a/tests/rest/client/v1/test_rooms.py
+++ b/tests/rest/client/v1/test_rooms.py
@@ -1524,4 +1524,4 @@ class LabelsTestCase(unittest.HomeserverTestCase):
             tok=self.tok,
         )
 
-        return event_id
\ No newline at end of file
+        return event_id