Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/from demos #37

Draft
wants to merge 91 commits into
base: develop
Choose a base branch
from
Draft

Feature/from demos #37

wants to merge 91 commits into from

Conversation

sanderPostma
Copy link
Contributor

@sanderPostma sanderPostma commented Oct 24, 2024

DRAFT - waiting for JARM stuff in SSI_SDK to be merged

# Conflicts:
#	package.json
#	packages/agent/package.json
#	packages/agent/src/agent.ts
#	packages/agent/src/credentials/dataSuppliers.ts
#	packages/agent/src/environment.ts
#	packages/agent/src/types/index.ts
#	packages/agent/src/utils/did.ts
#	packages/agent/src/utils/generic.ts
#	packages/agent/src/utils/oid4vci.ts
#	packages/agent/src/utils/oid4vciCredentialSuppliers.ts
#	packages/agent/src/utils/oid4vp.ts
#	packages/agent/src/utils/templateManager.ts
#	packages/web-wallet/package.json
#	packages/web-wallet/src/components/views/CredentialSelectionView/index.tsx
#	pnpm-lock.yaml
# Conflicts:
#	package.json
#	packages/agent/package.json
#	packages/agent/src/agent.ts
#	packages/web-wallet/package.json
#	packages/web-wallet/pages/contacts/show/index.tsx
#	packages/web-wallet/public/locales/en/common.json
#	packages/web-wallet/public/locales/nl/common.json
#	packages/web-wallet/src/components/views/CredentialCatalogView/index.tsx
#	packages/web-wallet/src/router/AppRouter.tsx
#	packages/web-wallet/src/types/component/index.ts
#	pnpm-lock.yaml
@sanderPostma sanderPostma marked this pull request as draft October 24, 2024 08:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant