Merge pull request #8044 from LedgerHQ/support/release-merge-conflicts

🚨 Release merge conflicts
LedgerHQ · Oct 8, 2024 · e561af1 · e561af1
2 parents 592449a + bae8de1
commit e561af1
Show file tree

Hide file tree

Showing 218 changed files with 6,433 additions and 1,773 deletions.
diff --git a/.changeset/big-snakes-marry.md b/.changeset/big-snakes-marry.md
diff --git a/.changeset/breezy-bottles-jam.md b/.changeset/breezy-bottles-jam.md
diff --git a/.changeset/brown-buckets-matter.md b/.changeset/brown-buckets-matter.md
diff --git a/.changeset/brown-ducks-rule.md b/.changeset/brown-ducks-rule.md
diff --git a/.changeset/calm-pets-shout.md b/.changeset/calm-pets-shout.md
diff --git a/.changeset/clever-rocks-watch.md b/.changeset/clever-rocks-watch.md
diff --git a/.changeset/cuddly-zebras-give.md b/.changeset/cuddly-zebras-give.md
diff --git a/.changeset/dry-otters-shop.md b/.changeset/dry-otters-shop.md
diff --git a/.changeset/empty-clouds-glow.md b/.changeset/empty-clouds-glow.md
diff --git a/.changeset/five-ties-sniff.md b/.changeset/five-ties-sniff.md
diff --git a/.changeset/four-worms-end.md b/.changeset/four-worms-end.md
diff --git a/.changeset/fresh-cobras-argue.md b/.changeset/fresh-cobras-argue.md
diff --git a/.changeset/great-months-lick.md b/.changeset/great-months-lick.md
diff --git a/.changeset/green-starfishes-suffer.md b/.changeset/green-starfishes-suffer.md
diff --git a/.changeset/lazy-tips-report.md b/.changeset/lazy-tips-report.md
diff --git a/.changeset/olive-drinks-complain.md b/.changeset/olive-drinks-complain.md
diff --git a/.changeset/plenty-hornets-turn.md b/.changeset/plenty-hornets-turn.md
diff --git a/.changeset/rare-yaks-deny.md b/.changeset/rare-yaks-deny.md
diff --git a/.changeset/seven-geese-play.md b/.changeset/seven-geese-play.md
diff --git a/.changeset/shy-apples-tickle.md b/.changeset/shy-apples-tickle.md
diff --git a/.changeset/six-hairs-raise.md b/.changeset/six-hairs-raise.md
diff --git a/.changeset/slow-dingos-destroy.md b/.changeset/slow-dingos-destroy.md
diff --git a/.changeset/sour-poets-play.md b/.changeset/sour-poets-play.md
diff --git a/.changeset/strong-goats-rush.md b/.changeset/strong-goats-rush.md
diff --git a/.changeset/stupid-students-clap.md b/.changeset/stupid-students-clap.md
diff --git a/.changeset/tasty-brooms-chew.md b/.changeset/tasty-brooms-chew.md
diff --git a/.changeset/thick-poets-lie.md b/.changeset/thick-poets-lie.md
diff --git a/.changeset/tough-terms-film.md b/.changeset/tough-terms-film.md
diff --git a/.changeset/witty-bugs-add.md b/.changeset/witty-bugs-add.md
diff --git a/.changeset/witty-cows-breathe.md b/.changeset/witty-cows-breathe.md
diff --git a/.changeset/yellow-flowers-march.md b/.changeset/yellow-flowers-march.md
diff --git a/apps/cli/CHANGELOG.md b/apps/cli/CHANGELOG.md
@@ -1,5 +1,53 @@
 # @ledgerhq/live-cli
 
+## 24.7.0
+
+### Minor Changes
+
+- [#7740](https://github.com/LedgerHQ/ledger-live/pull/7740) [`c83af75`](https://github.com/LedgerHQ/ledger-live/commit/c83af756fb388043c9f5a3862cae1231ec99a02c) Thanks [@hzheng-ledger](https://github.com/hzheng-ledger)! - Add etherlink evm currency
+
+### Patch Changes
+
+- Updated dependencies [[`c83af75`](https://github.com/LedgerHQ/ledger-live/commit/c83af756fb388043c9f5a3862cae1231ec99a02c), [`92df3b4`](https://github.com/LedgerHQ/ledger-live/commit/92df3b415e765dc26bc69438ca26b6308e98aa26), [`2f71fec`](https://github.com/LedgerHQ/ledger-live/commit/2f71fecc0e4bd2692277386931978242a25a364c), [`37d8fd9`](https://github.com/LedgerHQ/ledger-live/commit/37d8fd917bd2901e1005944d237656e562764818), [`be18f81`](https://github.com/LedgerHQ/ledger-live/commit/be18f816fa098f8217420b8a875b7afb1be748b0), [`307f467`](https://github.com/LedgerHQ/ledger-live/commit/307f4672ef4bf2020dff9d29e7f7227f2fb53901)]:
+  - @ledgerhq/cryptoassets@13.6.0
+  - @ledgerhq/live-common@34.10.0
+  - @ledgerhq/live-wallet@0.6.2
+  - @ledgerhq/coin-framework@0.18.2
+  - @ledgerhq/coin-bitcoin@0.8.2
+  - @ledgerhq/live-countervalues@0.2.7
+  - @ledgerhq/device-core@0.4.1
+
+## 24.7.0-next.0
+
+### Minor Changes
+
+- [#7740](https://github.com/LedgerHQ/ledger-live/pull/7740) [`c83af75`](https://github.com/LedgerHQ/ledger-live/commit/c83af756fb388043c9f5a3862cae1231ec99a02c) Thanks [@hzheng-ledger](https://github.com/hzheng-ledger)! - Add etherlink evm currency
+
+### Patch Changes
+
+- Updated dependencies [[`c83af75`](https://github.com/LedgerHQ/ledger-live/commit/c83af756fb388043c9f5a3862cae1231ec99a02c), [`92df3b4`](https://github.com/LedgerHQ/ledger-live/commit/92df3b415e765dc26bc69438ca26b6308e98aa26), [`2f71fec`](https://github.com/LedgerHQ/ledger-live/commit/2f71fecc0e4bd2692277386931978242a25a364c), [`37d8fd9`](https://github.com/LedgerHQ/ledger-live/commit/37d8fd917bd2901e1005944d237656e562764818), [`be18f81`](https://github.com/LedgerHQ/ledger-live/commit/be18f816fa098f8217420b8a875b7afb1be748b0), [`307f467`](https://github.com/LedgerHQ/ledger-live/commit/307f4672ef4bf2020dff9d29e7f7227f2fb53901)]:
+  - @ledgerhq/cryptoassets@13.6.0-next.0
+  - @ledgerhq/live-common@34.10.0-next.0
+  - @ledgerhq/live-wallet@0.6.2-next.0
+  - @ledgerhq/coin-framework@0.18.2-next.0
+  - @ledgerhq/coin-bitcoin@0.8.2-next.0
+  - @ledgerhq/live-countervalues@0.2.7-next.0
+  - @ledgerhq/device-core@0.4.1-next.0
+
+## 24.6.1
+
+### Patch Changes
+
+- Updated dependencies [[`77adfc3`](https://github.com/LedgerHQ/ledger-live/commit/77adfc33d4fd7d8f39329f23a36a55029331feb0)]:
+  - @ledgerhq/live-common@34.9.1
+
+## 24.6.1-hotfix.0
+
+### Patch Changes
+
+- Updated dependencies [[`77adfc3`](https://github.com/LedgerHQ/ledger-live/commit/77adfc33d4fd7d8f39329f23a36a55029331feb0)]:
+  - @ledgerhq/live-common@34.9.1-hotfix.0
+
 ## 24.6.0
 
 ### Minor Changes

diff --git a/apps/cli/package.json b/apps/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/live-cli",
-  "version": "24.6.0",
+  "version": "24.7.0",
   "description": "ledger-live CLI version",
   "repository": {
     "type": "git",