diff options
author | Chi Kei Chan <chikeichan@gmail.com> | 2018-01-20 07:29:36 +0800 |
---|---|---|
committer | Chi Kei Chan <chikeichan@gmail.com> | 2018-01-20 07:29:36 +0800 |
commit | 77c545336b38aefc6105cde1799b18066df8bef9 (patch) | |
tree | 121a140131c8cb1f4b746d8f37d4a403b0910aad /ui/app/root.js | |
parent | 98b5a62fa74aa6730a25df28dfe5032cfb487697 (diff) | |
parent | 4e63924e607a07f94ff0a741a036ab352b0b7a3f (diff) | |
download | tangerine-wallet-browser-77c545336b38aefc6105cde1799b18066df8bef9.tar tangerine-wallet-browser-77c545336b38aefc6105cde1799b18066df8bef9.tar.gz tangerine-wallet-browser-77c545336b38aefc6105cde1799b18066df8bef9.tar.bz2 tangerine-wallet-browser-77c545336b38aefc6105cde1799b18066df8bef9.tar.lz tangerine-wallet-browser-77c545336b38aefc6105cde1799b18066df8bef9.tar.xz tangerine-wallet-browser-77c545336b38aefc6105cde1799b18066df8bef9.tar.zst tangerine-wallet-browser-77c545336b38aefc6105cde1799b18066df8bef9.zip |
Merge branch 'uat' into newmaster
Diffstat (limited to 'ui/app/root.js')
-rw-r--r-- | ui/app/root.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/app/root.js b/ui/app/root.js index 9e7314b20..21d6d1829 100644 --- a/ui/app/root.js +++ b/ui/app/root.js @@ -2,7 +2,7 @@ const inherits = require('util').inherits const Component = require('react').Component const Provider = require('react-redux').Provider const h = require('react-hyperscript') -const App = require('./app') +const SelectedApp = require('./select-app') module.exports = Root @@ -15,7 +15,7 @@ Root.prototype.render = function () { h(Provider, { store: this.props.store, }, [ - h(App), + h(SelectedApp), ]) ) |