Skip to content

Commit

Permalink
fix: merge conflicts
Browse files Browse the repository at this point in the history 
# Conflicts:
#	waltid-services/waltid-e2e-tests/src/test/kotlin/ExchangeExternalSignaturesApi.kt
  • Loading branch information
@mikeplotean
mikeplotean committed Sep 6, 2024
1 parent 072d873 commit 2ca79ef
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions waltid-services/waltid-e2e-tests/src/test/kotlin/E2ESdJwtTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ import E2ETest.Companion.sdjwtCredential
import id.walt.issuer.issuance.IssuanceRequest
import id.walt.oid4vc.data.dif.PresentationDefinition
import id.walt.webwallet.db.models.WalletCredential
import id.walt.webwallet.web.controllers.UsePresentationRequest
import io.ktor.client.statement.*
import id.walt.webwallet.web.controllers.exchange.UsePresentationRequest
import io.ktor.http.*
import io.ktor.server.util.*
import kotlinx.coroutines.test.runTest
Expand Down

0 comments on commit 2ca79ef

Please sign in to comment.