diff --git 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 index 4128380d7..b662261bb 100644 --- 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 = (