Skip to content

Commit

Permalink
Merge pull request iron-fish#4213 from iron-fish/hotfix-1_7_1-staging…
Browse files Browse the repository at this point in the history
…-master-conflicts-merge

Hotfix 1.7.1 staging master conflicts merge
  • Loading branch information
jowparks authored Aug 14, 2023
2 parents 91b6791 + 1f51838 commit 03092c2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions ironfish-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ironfish",
"version": "1.7.0",
"version": "1.7.1",
"description": "CLI for running and interacting with an Iron Fish node",
"author": "Iron Fish <[email protected]> (https://ironfish.network)",
"main": "build/src/index.js",
Expand Down Expand Up @@ -60,7 +60,7 @@
"@aws-sdk/client-secrets-manager": "3",
"@aws-sdk/s3-request-presigner": "3",
"@ironfish/rust-nodejs": "1.6.0",
"@ironfish/sdk": "1.7.0",
"@ironfish/sdk": "1.7.1",
"@oclif/core": "1.23.1",
"@oclif/plugin-help": "5.1.12",
"@oclif/plugin-not-found": "2.3.1",
Expand Down
2 changes: 1 addition & 1 deletion ironfish/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ironfish/sdk",
"version": "1.7.0",
"version": "1.7.1",
"description": "SDK for running and interacting with an Iron Fish node",
"author": "Iron Fish <[email protected]> (https://ironfish.network)",
"main": "build/src/index.js",
Expand Down
2 changes: 1 addition & 1 deletion simulator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"docs:open": "open docs/index.html"
},
"dependencies": {
"@ironfish/sdk": "1.7.0",
"@ironfish/sdk": "1.7.1",
"@oclif/core": "1.23.1",
"@oclif/plugin-help": "5.1.12",
"@oclif/plugin-not-found": "2.3.1",
Expand Down

0 comments on commit 03092c2

Please sign in to comment.