Fix typo in merge conflict

This commit is contained in:
Erik Johnston 2014-08-19 15:02:47 +01:00
parent 347242a5c4
commit 22dd0b37c4

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
) )