diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-11-07 09:21:19 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-11-07 09:21:19 +0800 |
| commit | c651212025ab7cd0309d96be6687c1eba35ab9fa (patch) | |
| tree | fa5a6020daae332c5df47bdee3492e8a079375e3 /ui/app/components/token-cell.js | |
| parent | 9c1b2108f69334884473eb95758e2d1c02c984d6 (diff) | |
| parent | 7f944923d170d6e7e04f6e238d2fd5f80abe3161 (diff) | |
| download | tangerine-wallet-browser-c651212025ab7cd0309d96be6687c1eba35ab9fa.tar.gz tangerine-wallet-browser-c651212025ab7cd0309d96be6687c1eba35ab9fa.tar.zst tangerine-wallet-browser-c651212025ab7cd0309d96be6687c1eba35ab9fa.zip | |
fix merge conflicts
Diffstat (limited to 'ui/app/components/token-cell.js')
| -rw-r--r-- | ui/app/components/token-cell.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/app/components/token-cell.js b/ui/app/components/token-cell.js index 477d97597..75ba347fa 100644 --- a/ui/app/components/token-cell.js +++ b/ui/app/components/token-cell.js @@ -2,7 +2,7 @@ const Component = require('react').Component const h = require('react-hyperscript') const inherits = require('util').inherits const connect = require('react-redux').connect -const Identicon = require('./identicon') +import Identicon from './identicon' const prefixForNetwork = require('../../lib/etherscan-prefix-for-network') const selectors = require('../selectors') const actions = require('../actions') |