From 8387f9aa038e3ed8cbc1d6d163be148abd76cffd Mon Sep 17 00:00:00 2001
From: KhalilBellakrid <khalil.bellakrid@ledger.fr>
Date: Tue, 15 Jan 2019 12:16:28 +0100
Subject: [PATCH] Bump hw-app-btc to 4.33.6
---
package.json | 7 +------
yarn.lock | 8 ++++----
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/package.json b/package.json
index ec88d558..82d00683 100644
--- a/package.json
+++ b/package.json
@@ -40,13 +40,8 @@
"@ledgerhq/hw-app-xrp": "^4.32.0",
"@ledgerhq/hw-transport": "^4.32.0",
"@ledgerhq/hw-transport-node-hid": "^4.32.0",
-<<<<<<< HEAD
- "@ledgerhq/ledger-core": "2.0.0-rc.15",
- "@ledgerhq/live-common": "4.13.0",
-=======
"@ledgerhq/ledger-core": "2.0.0-rc.16",
- "@ledgerhq/live-common": "4.8.0-beta.24",
->>>>>>> Bump binding which now uses 1.1.9: fix getFees
+ "@ledgerhq/live-common": "4.13.0",
"animated": "^0.2.2",
"async": "^2.6.1",
"axios": "^0.18.0",
diff --git a/yarn.lock b/yarn.lock
index 1716e7bf..8b30bb86 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1722,10 +1722,10 @@
dependencies:
events "^3.0.0"
-"@ledgerhq/ledger-core@2.0.0-rc.14":
- version "2.0.0-rc.14"
- resolved "https://registry.yarnpkg.com/@ledgerhq/ledger-core/-/ledger-core-2.0.0-rc.14.tgz#538b771e9d837ce1d26aabaa1dfe58a6b882e3cd"
- integrity sha512-WIq6DyOoqtPPt+pS8K6NQ8EJD9GIn/VD1HLehWvJYqZhUf1IOIEIaOqxCnayHMQ/7b4c68xANgmKggUBdQ0M+A==
+"@ledgerhq/ledger-core@2.0.0-rc.16":
+ version "2.0.0-rc.16"
+ resolved "https://registry.yarnpkg.com/@ledgerhq/ledger-core/-/ledger-core-2.0.0-rc.16.tgz#51f141c0143edb020e38855bf2e2619e3446e74f"
+ integrity sha512-gmbeXRBg4NSqzH6+EajYTzaQlwN5ugaN1nH0SI6BvRqMfcorxNRE8byfh3F2u+7TNchBW72vOZnKPDShaR9/pQ==
dependencies:
bindings "^1.3.0"
nan "^2.6.2"