Fix

3 years ago · 7170d183e9
parent c6a6e6c21b
commit 7170d183e9
1 changed files with 0 additions and 4 deletions
--- a/ui/pages/send/send-content/send-gas-row/send-gas-row.component.js
+++ b/ui/pages/send/send-content/send-gas-row/send-gas-row.component.js
@ -64,10 +64,6 @@ export default class SendGasRow extends Component {
      minimumGasLimit,
    } = this.props;
    const { trackEvent } = this.context;
-<<<<<<< HEAD
-    const gasPriceFetchFailure = isEthGasPrice || noGasPrice;
-=======
->>>>>>> origin/develop

    const gasPriceButtonGroup = (
      <div>