resolve conflicts

harshjv · harshjv · commit 6c5c4a168fa0 · 2019-05-07T20:45:15.000+05:30
diff --git a/packages/ethereum-ledger-provider/lib/EthereumLedgerProvider.js b/packages/ethereum-ledger-provider/lib/EthereumLedgerProvider.js
@@ -67,7 +67,6 @@ export default class EthereumLedgerProvider extends LedgerProvider {
       data: data ? ensureHexEthFormat(data) : undefined,
       chainId: ensureHexEthFormat(BigNumber(this._network.chainId).toString(16))
     }
-
     const [nonce, gasPrice, gasLimit] = await Promise.all([
       this.getMethod('getTransactionCount')(ensureHexStandardFormat(from)),
       this.getMethod('getGasPrice')(),

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,6 @@ export default class EthereumLedgerProvider extends LedgerProvider {`
`67`	`67`	`data: data ? ensureHexEthFormat(data) : undefined,`
`68`	`68`	`chainId: ensureHexEthFormat(BigNumber(this._network.chainId).toString(16))`
`69`	`69`	`}`
`70`		`-`
`71`	`70`	`const [nonce, gasPrice, gasLimit] = await Promise.all([`
`72`	`71`	`this.getMethod('getTransactionCount')(ensureHexStandardFormat(from)),`
`73`	`72`	`this.getMethod('getGasPrice')(),`