Fix merge conflict
This commit is contained in:
parent
68e7f8afc6
commit
e21c0fdd9a
|
@ -290,7 +290,7 @@ const safeProviders: SafeProvider[] = [
|
|||
safeProvider({
|
||||
provide: CollectionAdminService,
|
||||
useClass: DefaultCollectionAdminService,
|
||||
deps: [ApiService, CryptoServiceAbstraction, EncryptService, CollectionService],
|
||||
deps: [ApiService, KeyServiceAbstraction, EncryptService, CollectionService],
|
||||
}),
|
||||
safeProvider({
|
||||
provide: ServerSettingsService,
|
||||
|
|
Loading…
Reference in New Issue