From 60eab0ebecddc969a47bf99ac593569765f38315 Mon Sep 17 00:00:00 2001
From: Ross <ross@jkrbinvestments.com>
Date: Sat, 12 Jan 2019 15:16:03 +0700
Subject: [PATCH] conflicts

---
 src/pages/App.scss               | 1 +
 src/pages/Pool/CreateExchange.js | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/App.scss b/src/pages/App.scss
index 6eb80a6f84..1bfd5f74d8 100644
--- a/src/pages/App.scss
+++ b/src/pages/App.scss
@@ -24,5 +24,6 @@
 #app-container {
   width: 100vw;
   height: 100vh;
+  
   @extend %col-nowrap;
 }
\ No newline at end of file
diff --git a/src/pages/Pool/CreateExchange.js b/src/pages/Pool/CreateExchange.js
index 3005c125c0..e751dd5581 100644
--- a/src/pages/Pool/CreateExchange.js
+++ b/src/pages/Pool/CreateExchange.js
@@ -181,7 +181,6 @@ class CreateExchange extends Component {
             'header--inactive': !isConnected,
           })}
         />
-
         <ModeSelector title={t("createExchange")} />
         <AddressInputPanel
           title="Token Address"