From 097a6afdc4c7bc9a32a1d0b3b61a01cf38478642 Mon Sep 17 00:00:00 2001
From: Ross <ross@jkrbinvestments.com>
Date: Sat, 12 Jan 2019 15:14:06 +0700
Subject: [PATCH] conflicts

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

diff --git a/src/pages/App.scss b/src/pages/App.scss
index 654b081c6a..6eb80a6f84 100644
--- a/src/pages/App.scss
+++ b/src/pages/App.scss
@@ -25,8 +25,4 @@
   width: 100vw;
   height: 100vh;
   @extend %col-nowrap;
-
-  @media only screen and (min-width : 768px) {
-    //max-width: 560px;
-  }
 }
\ No newline at end of file
diff --git a/src/pages/Pool/CreateExchange.js b/src/pages/Pool/CreateExchange.js
index 5e4ab6dede..3005c125c0 100644
--- a/src/pages/Pool/CreateExchange.js
+++ b/src/pages/Pool/CreateExchange.js
@@ -182,7 +182,7 @@ class CreateExchange extends Component {
           })}
         />
 
-        <ModeSelector title="Create Exchange" />
+        <ModeSelector title={t("createExchange")} />
         <AddressInputPanel
           title="Token Address"
           value={tokenAddress}