diff options
| author | kumavis <aaron@kumavis.me> | 2018-05-17 04:56:32 +0800 |
|---|---|---|
| committer | kumavis <aaron@kumavis.me> | 2018-05-17 04:56:32 +0800 |
| commit | 44f31f9a7e212550914c7b354cdd8e69534990cb (patch) | |
| tree | f55cd86d2c123becb2392112c2da953550e559d6 /ui/app/main-container.js | |
| parent | 8e1cad5ff60a67117bd6802dce15345d7b2542a4 (diff) | |
| parent | 76c8cb3d7b1cbd5b5a3e48fac4b08e44ad936850 (diff) | |
| download | tangerine-wallet-browser-44f31f9a7e212550914c7b354cdd8e69534990cb.tar.gz tangerine-wallet-browser-44f31f9a7e212550914c7b354cdd8e69534990cb.tar.zst tangerine-wallet-browser-44f31f9a7e212550914c7b354cdd8e69534990cb.zip | |
Merge branch 'develop' of github.com:MetaMask/metamask-extension into scsaba-transaction-history-timestamps
Diffstat (limited to 'ui/app/main-container.js')
| -rw-r--r-- | ui/app/main-container.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/app/main-container.js b/ui/app/main-container.js index c305687ea..c9b05db3b 100644 --- a/ui/app/main-container.js +++ b/ui/app/main-container.js @@ -3,7 +3,7 @@ const h = require('react-hyperscript') const inherits = require('util').inherits const AccountAndTransactionDetails = require('./account-and-transaction-details') const Settings = require('./components/pages/settings') -const UnlockScreen = require('./components/pages/unlock') +const UnlockScreen = require('./components/pages/unlock-page') const log = require('loglevel') module.exports = MainContainer |