conflicts

2019-01-12 15:16:03 +07:00 · 2019-01-12 15:16:03 +07:00 · 60eab0ebec
commit 60eab0ebec
parent 097a6afdc4
2 changed files with 1 additions and 1 deletions
--- a/src/pages/App.scss
+++ b/src/pages/App.scss
@ -24,5 +24,6 @@
 #app-container {
  width: 100vw;
  height: 100vh;
+  
  @extend %col-nowrap;
 }
--- 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"