diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2019-09-06 15:44:48 +0100 |
---|---|---|
committer | Brendan Abolivier <babolivier@matrix.org> | 2019-09-06 15:44:48 +0100 |
commit | e35c30ed4bb132cb20132c31cdabaebfce1b69bb (patch) | |
tree | 776d059fb31c59bb65b785a95e0f751691005d6e | |
parent | Merge branch 'dinsic' into babolivier/dinsic-3pid-invite (diff) | |
download | synapse-e35c30ed4bb132cb20132c31cdabaebfce1b69bb.tar.xz |
Fix bogus conflict resolution
-rw-r--r-- | tests/rest/client/test_room_access_rules.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/rest/client/test_room_access_rules.py b/tests/rest/client/test_room_access_rules.py |