From c084d31b37dcca4aad6e9e7bda5239291f03ae6f Mon Sep 17 00:00:00 2001
From: Jack Mallers <jimmymowschess@gmail.com>
Date: Tue, 21 Nov 2017 22:31:54 -0600
Subject: [PATCH] fix merge conflicts

---
 app/routes/app/components/App.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/routes/app/components/App.js b/app/routes/app/components/App.js
index 1472f508..df379315 100644
--- a/app/routes/app/components/App.js
+++ b/app/routes/app/components/App.js
@@ -45,10 +45,7 @@ class App extends Component {
       children
     } = this.props
 
-
-    if (!currentTicker || balance.balanceLoading) { 
-      return <LoadingBolt />
-    }
+    if (!currentTicker || balance.balanceLoading) { return <LoadingBolt /> }
 
     return (
       <div>