diff options
| author | Kevin Serrano <kevin.serrano@consensys.net> | 2017-10-27 07:22:08 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-10-27 07:22:08 +0800 |
| commit | 1e9c0a9db2d58e61361bff7430d3a74006ef131c (patch) | |
| tree | 1d1f09bfe2e1985c42d5a117e8e63d19c71a360b /ui/lib/tx-helper.js | |
| parent | a387def701303e56f721fdc7c716e72641bfaf8f (diff) | |
| parent | 19afb638194a11367250153a710d77011665132a (diff) | |
| download | tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar.gz tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar.bz2 tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar.lz tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar.xz tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar.zst tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.zip | |
Resolve merge conflicts
Diffstat (limited to 'ui/lib/tx-helper.js')
| -rw-r--r-- | ui/lib/tx-helper.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/lib/tx-helper.js b/ui/lib/tx-helper.js index 341567e2f..de3f00d2d 100644 --- a/ui/lib/tx-helper.js +++ b/ui/lib/tx-helper.js @@ -24,4 +24,4 @@ module.exports = function (unapprovedTxs, unapprovedMsgs, personalMsgs, typedMes }) return allValues -}
\ No newline at end of file +} |