diff options
| author | Alexander Tseung <alextsg@gmail.com> | 2018-02-01 10:24:20 +0800 |
|---|---|---|
| committer | Alexander Tseung <alextsg@gmail.com> | 2018-02-01 10:24:20 +0800 |
| commit | 4f1fe1da6295902e3e0fee633444f84f61f28449 (patch) | |
| tree | a8e35564ec7963c70cd61868323c202bdc7131dd /ui/app/conf-tx.js | |
| parent | 0c6fef3dec4f3ba70e8e86275ee9db4f2d58d129 (diff) | |
| parent | 78bce55858916ba9d3189f76db440768e6ae95b1 (diff) | |
| download | tangerine-wallet-browser-4f1fe1da6295902e3e0fee633444f84f61f28449.tar tangerine-wallet-browser-4f1fe1da6295902e3e0fee633444f84f61f28449.tar.gz tangerine-wallet-browser-4f1fe1da6295902e3e0fee633444f84f61f28449.tar.bz2 tangerine-wallet-browser-4f1fe1da6295902e3e0fee633444f84f61f28449.tar.lz tangerine-wallet-browser-4f1fe1da6295902e3e0fee633444f84f61f28449.tar.xz tangerine-wallet-browser-4f1fe1da6295902e3e0fee633444f84f61f28449.tar.zst tangerine-wallet-browser-4f1fe1da6295902e3e0fee633444f84f61f28449.zip | |
Fix merge conflicts from uat-next
Diffstat (limited to 'ui/app/conf-tx.js')
| -rw-r--r-- | ui/app/conf-tx.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js index 05bbd2696..913563d12 100644 --- a/ui/app/conf-tx.js +++ b/ui/app/conf-tx.js @@ -126,7 +126,6 @@ ConfirmTxScreen.prototype.render = function () { cancelPersonalMessage: this.cancelPersonalMessage.bind(this, txData), cancelTypedMessage: this.cancelTypedMessage.bind(this, txData), }) - } function currentTxView (opts) { |