Resolve merge conflicts

1 files changed, 6 insertions, 6 deletions

diff --git a/app/scripts/lib/pending-tx-tracker.js b/app/scripts/lib/pending-tx-tracker.js
index df504c126..0d7c6a92c 100644
--- a/app/scripts/lib/pending-tx-tracker.js
+++ b/app/scripts/lib/pending-tx-tracker.js
@@ -81,14 +81,14 @@ module.exports = class PendingTransactionTracker extends EventEmitter {
       const errorMessage = err.message.toLowerCase()
       const isKnownTx = (
         // geth
-        errorMessage.includes('replacement transaction underpriced')
-        || errorMessage.includes('known transaction')
+        errorMessage.includes('replacement transaction underpriced') ||
+        errorMessage.includes('known transaction') ||
         // parity
-        || errorMessage.includes('gas price too low to replace')
-        || errorMessage.includes('transaction with the same hash was already imported')
+        errorMessage.includes('gas price too low to replace') ||
+        errorMessage.includes('transaction with the same hash was already imported') ||
         // other
-        || errorMessage.includes('gateway timeout')
-        || errorMessage.includes('nonce too low')
+        errorMessage.includes('gateway timeout') ||
+        errorMessage.includes('nonce too low')
       )
       // ignore resubmit warnings, return early
       if (isKnownTx) return