Skip to content

Commit

Permalink
Fix a sneaky merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
jon-signal committed Jun 5, 2023
1 parent 085c7a6 commit 9c93d37
Showing 1 changed file with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,8 @@ public void testUsernameLinksViaAccountsManager() throws Exception {
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),
Expand Down

0 comments on commit 9c93d37

Please sign in to comment.