Fix conflict

1 files changed, 5 insertions, 6 deletions

diff --git a/ui/app/template.js b/ui/app/template.js
index f16f3c363..d15b30fd2 100644
--- a/ui/app/template.js
+++ b/ui/app/template.js
@@ -2,29 +2,28 @@ const inherits = require('util').inherits
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const connect = require('react-redux').connect
-const actions = require('./actions')
 
 module.exports = connect(mapStateToProps)(COMPONENTNAME)
 
-function mapStateToProps(state) {
+function mapStateToProps (state) {
   return {}
 }
 
 inherits(COMPONENTNAME, Component)
-function COMPONENTNAME() {
+function COMPONENTNAME () {
   Component.call(this)
 }
 
-COMPONENTNAME.prototype.render = function() {
+COMPONENTNAME.prototype.render = function () {
   const props = this.props
 
   return (
     h('div', {
       style: {
         background: 'blue',
-      }
+      },
     }, [
-      'Hello, world!'
+      `Hello, ${props.sender}`,
     ])
   )
 }