From 22dd0b37c4215a001e801ebe4bdfa36153ea1324 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 19 Aug 2014 15:02:47 +0100 Subject: [PATCH] Fix typo in merge conflict --- tests/rest/test_presence.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/rest/test_presence.py b/tests/rest/test_presence.py index 80b5972b4..0ba72addf 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 )