mirror of
https://github.com/signalapp/Signal-Server
synced 2026-04-22 02:38:03 +01:00
Fix a sneaky merge conflict
This commit is contained in:
@@ -154,7 +154,8 @@ class AccountsTest {
|
||||
accounts,
|
||||
mock(PhoneNumberIdentifiers.class),
|
||||
mock(FaultTolerantRedisCluster.class),
|
||||
mock(DeletedAccountsManager.class),
|
||||
mock(AccountLockManager.class),
|
||||
mock(DeletedAccounts.class),
|
||||
mock(Keys.class),
|
||||
mock(MessagesManager.class),
|
||||
mock(ProfilesManager.class),
|
||||
|
||||
Reference in New Issue
Block a user