diff options
| author | Alexander Tseung <alextsg@gmail.com> | 2018-03-31 07:18:48 +0800 |
|---|---|---|
| committer | Alexander Tseung <alextsg@gmail.com> | 2018-03-31 07:18:48 +0800 |
| commit | ba23843f91ca5046400cea14cea4c0d256578fec (patch) | |
| tree | e29ef2a930930d4256bd7f59aa3d0274563bc4cf /ui/app/conf-tx.js | |
| parent | bdc4a6964ae83faa8229c50870e3bcc9b9074989 (diff) | |
| parent | 8e0f39353dd47c4a201aaf2ee160912846f2e68b (diff) | |
| download | tangerine-wallet-browser-ba23843f91ca5046400cea14cea4c0d256578fec.tar.gz tangerine-wallet-browser-ba23843f91ca5046400cea14cea4c0d256578fec.tar.zst tangerine-wallet-browser-ba23843f91ca5046400cea14cea4c0d256578fec.zip | |
Fix merge conflicts
Diffstat (limited to 'ui/app/conf-tx.js')
| -rw-r--r-- | ui/app/conf-tx.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js index 35ec6c7af..816127ab8 100644 --- a/ui/app/conf-tx.js +++ b/ui/app/conf-tx.js @@ -1,7 +1,7 @@ const inherits = require('util').inherits const Component = require('react').Component const h = require('react-hyperscript') -const connect = require('./metamask-connect') +const connect = require('react-redux').connect const { withRouter, Redirect } = require('react-router-dom') const { compose } = require('recompose') const actions = require('./actions') |