Skip to content

Commit

Permalink
fix:solved merged conflicts
Browse files Browse the repository at this point in the history
Signed-off-by: pallavicoder <[email protected]>
  • Loading branch information
pallavighule committed May 9, 2024
1 parent 541fcd4 commit 440892e
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"validate": "yarn lint && yarn check-types && yarn check-format"
},
"dependencies": {
<<<<<<< HEAD
"@ayanworks/credo-polygon-w3c-module": "0.0.2-alpha.8",
"@credo-ts/anoncreds": "0.5.3",
"@credo-ts/askar": "0.5.3",
Expand All @@ -50,20 +49,6 @@
"@hyperledger/anoncreds-nodejs": "0.2.2",
"@hyperledger/aries-askar-nodejs": "0.2.1",
"@hyperledger/indy-vdr-nodejs": "0.2.2",
=======
"@ayanworks/credo-polygon-w3c-module": "0.0.2-alpha.7",
"@credo-ts/anoncreds": "0.5.1",
"@credo-ts/askar": "0.5.1",
"@credo-ts/core": "0.5.1",
"@credo-ts/indy-vdr": "0.5.1",
"@credo-ts/node": "0.5.1",
"@credo-ts/push-notifications": "^0.7.0",
"@credo-ts/question-answer": "0.5.1",
"@credo-ts/tenants": "0.5.1",
"@hyperledger/anoncreds-nodejs": "0.2.1",
"@hyperledger/aries-askar-nodejs": "0.2.0",
"@hyperledger/indy-vdr-nodejs": "0.2.0",
>>>>>>> 81e66a3... merge: develop to main (#98)
"@tsoa/runtime": "^6.0.0",
"@types/node-fetch": "^2.6.4",
"@types/ref-struct-di": "^1.1.9",
Expand Down

0 comments on commit 440892e

Please sign in to comment.