Merge pull request #3224 from input-output-hk/merge-main-6-0-1-into-develop

michalrus · web-flow · commit 7e09e21424f9 · 2024-09-06T09:11:28.000+02:00
Merge `main` with 6.0.1 into `develop`
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## vNext
 
+## 6.0.1
+
 ### Fixes
 
 - Update `cardano-node` to a 9.1.1 (hotfix for the ledger replay bug) ([PR 3221](https://github.com/input-output-hk/daedalus/pull/3221))
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "daedalus",
   "productName": "Daedalus",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "Cryptocurrency Wallet",
   "main": "./dist/main/index.js",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "daedalus",`
`3`	`3`	`"productName": "Daedalus",`
`4`		`- "version": "6.0.0",`
	`4`	`+ "version": "6.0.1",`
`5`	`5`	`"description": "Cryptocurrency Wallet",`
`6`	`6`	`"main": "./dist/main/index.js",`
`7`	`7`	`"scripts": {`