diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-19 15:02:47 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-19 15:02:47 +0100 |
| commit | 22dd0b37c4215a001e801ebe4bdfa36153ea1324 (patch) | |
| tree | 6d470f79a53f2cff682c80eaca094c9d1f737661 /tests | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor (diff) | |
| download | synapse-22dd0b37c4215a001e801ebe4bdfa36153ea1324.tar.xz | |
Fix typo in merge conflict
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/rest/test_presence.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/rest/test_presence.py b/tests/rest/test_presence.py index 80b5972b4b..0ba72addf6 100644 --- a/tests/rest/test_presence.py +++ b/tests/rest/test_presence.py @@ -57,7 +57,6 @@ class PresenceStateTestCase(unittest.TestCase): "set_presence_state", ]), http_client=None, - datastore=None, resource_for_client=self.mock_resource, resource_for_federation=self.mock_resource, ) @@ -135,7 +134,6 @@ class PresenceListTestCase(unittest.TestCase): "get_presence_list", ]), http_client=None, - datastore=None, resource_for_client=self.mock_resource, resource_for_federation=self.mock_resource ) |