diff options
author | Alexander Tseung <alextsg@gmail.com> | 2017-12-23 03:00:46 +0800 |
---|---|---|
committer | Alexander Tseung <alextsg@gmail.com> | 2017-12-23 03:00:46 +0800 |
commit | 06410381d4b738fe22aa24973c7f9568d295f570 (patch) | |
tree | 69bd8701cdaa417cb6c0f46deff43414122101db /ui/app/root.js | |
parent | 06f496310ce7d719bbb5690f307db143ba57a1a7 (diff) | |
parent | a218008adf85dfb5fa8ca93c789e14d9f2090813 (diff) | |
download | tangerine-wallet-browser-06410381d4b738fe22aa24973c7f9568d295f570.tar tangerine-wallet-browser-06410381d4b738fe22aa24973c7f9568d295f570.tar.gz tangerine-wallet-browser-06410381d4b738fe22aa24973c7f9568d295f570.tar.bz2 tangerine-wallet-browser-06410381d4b738fe22aa24973c7f9568d295f570.tar.lz tangerine-wallet-browser-06410381d4b738fe22aa24973c7f9568d295f570.tar.xz tangerine-wallet-browser-06410381d4b738fe22aa24973c7f9568d295f570.tar.zst tangerine-wallet-browser-06410381d4b738fe22aa24973c7f9568d295f570.zip |
Merge branch 'NewUI-flat' into merge-master
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), ]) ) |