Fix conflict

1 files changed, 4 insertions, 5 deletions

diff --git a/ui/app/loading.js b/ui/app/loading.js
index f6279d5cf..606b53dde 100644
--- a/ui/app/loading.js
+++ b/ui/app/loading.js
@@ -2,23 +2,22 @@ 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')
 const ReactCSSTransitionGroup = require('react-addons-css-transition-group')
 
 module.exports = connect(mapStateToProps)(LoadingIndicator)
 
-function mapStateToProps(state) {
+function mapStateToProps (state) {
   return {
     isLoading: state.appState.isLoading,
   }
 }
 
 inherits(LoadingIndicator, Component)
-function LoadingIndicator() {
+function LoadingIndicator () {
   Component.call(this)
 }
 
-LoadingIndicator.prototype.render = function() {
+LoadingIndicator.prototype.render = function () {
   var isLoading = this.props.isLoading
 
   return (
@@ -38,7 +37,7 @@ LoadingIndicator.prototype.render = function() {
           height: '100%',
           width: '100%',
           background: 'rgba(255, 255, 255, 0.5)',
-        }
+        },
       }, [
         h('img', {
           src: 'images/loading.svg',