diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2017-02-28 08:35:25 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2017-02-28 08:35:25 +0800 |
| commit | 98e80e674003fabbea7e134a8775f2a7f61cabe1 (patch) | |
| tree | e50227193341dc418ce480d849ec94b17e2a9325 /ui/app/components/pending-tx.js | |
| parent | 5d1a4db5e51158523c2c8f3979c91800ddfc041e (diff) | |
| parent | c4e935457589b9bb503a430906515b48a24a6d3d (diff) | |
| download | tangerine-wallet-browser-98e80e674003fabbea7e134a8775f2a7f61cabe1.tar tangerine-wallet-browser-98e80e674003fabbea7e134a8775f2a7f61cabe1.tar.gz tangerine-wallet-browser-98e80e674003fabbea7e134a8775f2a7f61cabe1.tar.bz2 tangerine-wallet-browser-98e80e674003fabbea7e134a8775f2a7f61cabe1.tar.lz tangerine-wallet-browser-98e80e674003fabbea7e134a8775f2a7f61cabe1.tar.xz tangerine-wallet-browser-98e80e674003fabbea7e134a8775f2a7f61cabe1.tar.zst tangerine-wallet-browser-98e80e674003fabbea7e134a8775f2a7f61cabe1.zip | |
Fix merge conflicts.
Diffstat (limited to 'ui/app/components/pending-tx.js')
| -rw-r--r-- | ui/app/components/pending-tx.js | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js index 2b0bb1dfb..3c898edec 100644 --- a/ui/app/components/pending-tx.js +++ b/ui/app/components/pending-tx.js @@ -12,9 +12,7 @@ function PendingTx () { PendingTx.prototype.render = function () { const props = this.props - const state = this.state || {} const txData = props.txData - const txParams = txData.txParams return ( |