mirrors/synapse
mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2025-03-31 03:45:13 +00:00
Code Activity

Fix typo in merge conflict

Browse source
This commit is contained in:
Erik Johnston 2014-08-19 15:02:47 +01:00
parent 347242a5c4
commit 22dd0b37c4
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/rest/test_presence.py
View file

@ -57,7 +57,6 @@ class PresenceStateTestCase(unittest.TestCase):
"set_presence_state", "set_presence_state",
]), ]),
http_client=None, http_client=None,
datastore=None,
resource_for_client=self.mock_resource, resource_for_client=self.mock_resource,
resource_for_federation=self.mock_resource, resource_for_federation=self.mock_resource,
) )
@ -135,7 +134,6 @@ class PresenceListTestCase(unittest.TestCase):
"get_presence_list", "get_presence_list",
]), ]),
http_client=None, http_client=None,
datastore=None,
resource_for_client=self.mock_resource, resource_for_client=self.mock_resource,
resource_for_federation=self.mock_resource resource_for_federation=self.mock_resource
) )