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/components/template.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/components/template.js')
| -rw-r--r-- | ui/app/components/template.js | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ui/app/components/template.js b/ui/app/components/template.js index 9e4eca20f..b6ed8eaa0 100644 --- a/ui/app/components/template.js +++ b/ui/app/components/template.js @@ -4,16 +4,15 @@ const inherits = require('util').inherits module.exports = NewComponent - inherits(NewComponent, Component) -function NewComponent() { +function NewComponent () { Component.call(this) } -NewComponent.prototype.render = function() { - var state = this.props +NewComponent.prototype.render = function () { + const props = this.props return ( - h('span', 'Placeholder component') + h('span', props.message) ) } |