chore: resolve develop conflict

LedgerHQ · Feb 23, 2024 · 9ce03e3 · 9ce03e3
1 parent a8cf305
commit 9ce03e3
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 38 deletions.
diff --git a/apps/ledger-live-desktop/package.json b/apps/ledger-live-desktop/package.json
@@ -186,7 +186,10 @@
  "@types/write-file-atomic": "^4.0.0",
  "@vitejs/plugin-react": "^3.1.0",
  "allure-playwright": "2.12.2",
+ "axios": "^1.3.4",
+ "chalk": "^4.1.2",
  "cross-env": "^7.0.3",
+ "debug": "^4.3.4",
  "electron": "^28.2.1",
  "electron-builder": "^24.0.0",
  "electron-devtools-installer": "^3.2.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml