Skip to content

Commit

Permalink
chore: resolve merge compilation conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
patlo-iog committed Apr 29, 2024
1 parent e08ae2d commit 981a48e
Showing 1 changed file with 2 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import io.iohk.atala.castor.core.service.{DIDService, MockDIDService}
import io.iohk.atala.iam.oidc.http.{ClaimDescriptor, CredentialDefinition, Localization}
import io.iohk.atala.iam.oidc.service.{OIDCCredentialIssuerService, OIDCCredentialIssuerServiceImpl}
import io.iohk.atala.iam.oidc.storage.InMemoryIssuanceSessionService
import io.iohk.atala.pollux.core.repository.CredentialStatusListRepositoryInMemory
import io.iohk.atala.pollux.core.repository.{CredentialRepository, CredentialRepositoryInMemory}
import io.iohk.atala.pollux.core.service.*
import io.iohk.atala.pollux.vc.jwt.PrismDidResolver
Expand All @@ -29,6 +30,7 @@ object OIDCCredentialIssuerServiceSpec extends MockSpecDefault with CredentialSe
](
InMemoryIssuanceSessionService.layer,
CredentialRepositoryInMemory.layer,
CredentialStatusListRepositoryInMemory.layer,
PrismDidResolver.layer,
credentialDefinitionServiceLayer,
GenericSecretStorageInMemory.layer,
Expand Down

0 comments on commit 981a48e

Please sign in to comment.