diff options
| author | Alexander Tseung <alextsg@gmail.com> | 2018-03-30 00:37:29 +0800 |
|---|---|---|
| committer | Alexander Tseung <alextsg@gmail.com> | 2018-03-30 00:37:29 +0800 |
| commit | ef61ef2ce885635862bb242612dd821cb3a65b6b (patch) | |
| tree | 0f128f8b56b57a1bbe96dcf5743d34b5f95dc4cc /ui/app/conf-tx.js | |
| parent | 58f52b2b8de9efd43896e23ab0ac9972f45bb278 (diff) | |
| parent | 8766420f19251b95211dd99ff9a45e60cf0177ad (diff) | |
| download | tangerine-wallet-browser-ef61ef2ce885635862bb242612dd821cb3a65b6b.tar.gz tangerine-wallet-browser-ef61ef2ce885635862bb242612dd821cb3a65b6b.tar.zst tangerine-wallet-browser-ef61ef2ce885635862bb242612dd821cb3a65b6b.zip | |
Fix i18n 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 fbccfd6c5..57ae89dc6 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('react-redux').connect +const connect = require('./metamask-connect') const { withRouter } = require('react-router-dom') const { compose } = require('recompose') const actions = require('./actions') |