From e35c30ed4bb132cb20132c31cdabaebfce1b69bb Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <babolivier@matrix.org>
Date: Fri, 6 Sep 2019 15:44:48 +0100
Subject: Fix bogus conflict resolution

---
 tests/rest/client/test_room_access_rules.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/rest/client/test_room_access_rules.py b/tests/rest/client/test_room_access_rules.py
index 8da56c29dd..ab76e0f25a 100644
--- a/tests/rest/client/test_room_access_rules.py
+++ b/tests/rest/client/test_room_access_rules.py
@@ -586,6 +586,7 @@ class RoomAccessTestCase(unittest.HomeserverTestCase):
             body=topic_content,
             tok=self.tok,
             expect_code=403,
+        )
 
     def test_revoke_3pid_invite_direct(self):
         """Tests that revoking a 3PID invite doesn't cause the room access rules module to
-- 
cgit 1.5.1