fix rebase error

src/components/ContextualInfo/index.js

@@ -32,28 +32,9 @@ class ContextualInfo extends Component {
     }
 
     return (
-      <Modal key="modal" onClose={() => this.setState({ showDetailModal: false })}>
-        <CSSTransitionGroup
-          transitionName="summary-modal"
-          transitionAppear={true}
-          transitionLeave={true}
-          transitionAppearTimeout={200}
-          transitionLeaveTimeout={200}
-          transitionEnterTimeout={200}
-        >
-          <div className={c('contextual-info__summary-modal', modalClass)}>
-            <div
-              key="open-details"
-              className="contextual-info__open-details-container contextual-info__modal-button"
-              onClick={() => this.setState({showDetailModal: false})}
-            >
-              <span>{this.props.openModalText}</span>
-              <img src={DropupBlue} />
-            </div>
-            {this.props.renderTransactionDetails()}
-          </div>
-        </CSSTransitionGroup>
-      </Modal>
+      <div className="contextual-info__details">
+        {this.props.renderTransactionDetails()}
+      </div>
     );
   }
 

src/pages/Pool/RemoveLiquidity.js

@@ -231,17 +231,10 @@ class RemoveLiquidity extends Component {
 
     return (
       <div>
-<<<<<<< HEAD
-        <div className="pool__summary-item">You are removing between {b(`${+BN(ethWithdrawn).toFixed(7)} ETH`)} and {b(`${+minTokenWithdrawn} - ${+maxTokenWithdrawn} ${label}`)} into the liquidity pool.</div>
-        <div className="pool__summary-item">You will remove {b(+input)} liquidity tokens.</div>
-        <div className="pool__summary-item">Current total supply of liquidity tokens is {b(+adjTotalSupply.toFixed(7))}</div>
-        <div className="pool__summary-item">At current exchange rate, each pool token is worth {b(+ethReserve.dividedBy(totalSupply).toFixed(7))} ETH and {b(+tokenReserve.dividedBy(totalSupply).toFixed(7))} {label}</div>
-=======
         <div className="pool__summary-modal__item">{t("youAreRemoving")} {b(`${+BN(ethWithdrawn).toFixed(7)} ETH`)} {t("and")} {b(`${+minTokenWithdrawn} - ${+maxTokenWithdrawn} ${label}`)} {t("outPool")}</div>
         <div className="pool__summary-modal__item">{t("youWillRemove")} {b(+input)} {t("liquidityTokens")}</div>
         <div className="pool__summary-modal__item">{t("totalSupplyIs")} {b(+adjTotalSupply.toFixed(7))}</div>
         <div className="pool__summary-modal__item">{t("tokenWorth")} {b(+ethReserve.dividedBy(totalSupply).toFixed(7))} ETH {t("and")} {b(+tokenReserve.dividedBy(totalSupply).toFixed(7))} {label}</div>
->>>>>>> 30eade0... i18n support
       </div>
     );
   }