mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-10-01 11:49:51 -04:00
Fix typo in merge conflict
This commit is contained in:
parent
347242a5c4
commit
22dd0b37c4
@ -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
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user