diff options
author | Erik Johnston <erik@matrix.org> | 2014-11-19 18:03:03 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-11-19 18:03:03 +0000 |
commit | 1a9551db82d553316d65ad9521d47bbe438db6c4 (patch) | |
tree | 6015e4155502d34fd8aa35fc32094d8c29981a0a /tests/rest/test_rooms.py | |
parent | Bump version, changelog and upgrade.rst (diff) | |
parent | Fix tests from prev commit (diff) | |
download | synapse-1a9551db82d553316d65ad9521d47bbe438db6c4.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.5.0
Diffstat (limited to 'tests/rest/test_rooms.py')
-rw-r--r-- | tests/rest/test_rooms.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/rest/test_rooms.py b/tests/rest/test_rooms.py index ad3631d510..ff7c9f0530 100644 --- a/tests/rest/test_rooms.py +++ b/tests/rest/test_rooms.py @@ -840,7 +840,6 @@ class RoomMemberStateTestCase(RestTestCase): expected_response = { "membership": Membership.JOIN, - "prev": Membership.JOIN, } self.assertEquals(expected_response, response) |