diff options
author | Frankie <frankie.pangilinan@consensys.net> | 2016-06-22 06:04:00 +0800 |
---|---|---|
committer | Frankie <frankie.pangilinan@consensys.net> | 2016-06-22 06:04:00 +0800 |
commit | cf663f1104697440121d32cc6db2a8a1d5d54c5a (patch) | |
tree | 3ed4b8b9fe8c85f3b3a5bf68482c3fb9967f2de5 /ui/app/root.js | |
parent | 265725c6edd62a7f46a9b9cf5a443cf01f0ff00c (diff) | |
parent | dc2ef967028723afe9fe1efd669754723e38a4f0 (diff) | |
download | tangerine-wallet-browser-cf663f1104697440121d32cc6db2a8a1d5d54c5a.tar tangerine-wallet-browser-cf663f1104697440121d32cc6db2a8a1d5d54c5a.tar.gz tangerine-wallet-browser-cf663f1104697440121d32cc6db2a8a1d5d54c5a.tar.bz2 tangerine-wallet-browser-cf663f1104697440121d32cc6db2a8a1d5d54c5a.tar.lz tangerine-wallet-browser-cf663f1104697440121d32cc6db2a8a1d5d54c5a.tar.xz tangerine-wallet-browser-cf663f1104697440121d32cc6db2a8a1d5d54c5a.tar.zst tangerine-wallet-browser-cf663f1104697440121d32cc6db2a8a1d5d54c5a.zip |
Fix conflict
Diffstat (limited to 'ui/app/root.js')
-rw-r--r-- | ui/app/root.js | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ui/app/root.js b/ui/app/root.js index 9fedf625f..9e7314b20 100644 --- a/ui/app/root.js +++ b/ui/app/root.js @@ -1,5 +1,4 @@ const inherits = require('util').inherits -const React = require('react') const Component = require('react').Component const Provider = require('react-redux').Provider const h = require('react-hyperscript') @@ -7,17 +6,16 @@ const App = require('./app') module.exports = Root - inherits(Root, Component) -function Root() { Component.call(this) } +function Root () { Component.call(this) } -Root.prototype.render = function() { +Root.prototype.render = function () { return ( - + h(Provider, { store: this.props.store, }, [ - h(App) + h(App), ]) ) |