vaultwarden
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

Fix merge conflict

This commit is contained in:
Alec Rippberger 2024-10-28 10:19:55 -05:00
parent 68e7f8afc6
commit e21c0fdd9a
No known key found for this signature in database
GPG Key ID: 9DD8DA583B28154A
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/web/src/app/core/core.module.ts
View File

@ -290,7 +290,7 @@ const safeProviders: SafeProvider[] = [
safeProvider({ safeProvider({
provide: CollectionAdminService, provide: CollectionAdminService,
useClass: DefaultCollectionAdminService, useClass: DefaultCollectionAdminService,
deps: [ApiService, CryptoServiceAbstraction, EncryptService, CollectionService], deps: [ApiService, KeyServiceAbstraction, EncryptService, CollectionService],
}), }),
safeProvider({ safeProvider({
provide: ServerSettingsService, provide: ServerSettingsService,