aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers/transactions
diff options
context:
space:
mode:
authorfrankiebee <frankie.diamond@gmail.com>2018-07-11 02:32:05 +0800
committerfrankiebee <frankie.diamond@gmail.com>2018-07-11 02:32:05 +0800
commit28c509914bf09850dd9aaef52b212f6271633e93 (patch)
tree049373cf51ae16580a5f18dd29e195e68d4f7b53 /app/scripts/controllers/transactions
parent94a4f99115cf549a3014d29d828e7a432bf36a62 (diff)
parentf6de948e42ae633d40aef72595a01caa622a280d (diff)
downloadtangerine-wallet-browser-28c509914bf09850dd9aaef52b212f6271633e93.tar
tangerine-wallet-browser-28c509914bf09850dd9aaef52b212f6271633e93.tar.gz
tangerine-wallet-browser-28c509914bf09850dd9aaef52b212f6271633e93.tar.bz2
tangerine-wallet-browser-28c509914bf09850dd9aaef52b212f6271633e93.tar.lz
tangerine-wallet-browser-28c509914bf09850dd9aaef52b212f6271633e93.tar.xz
tangerine-wallet-browser-28c509914bf09850dd9aaef52b212f6271633e93.tar.zst
tangerine-wallet-browser-28c509914bf09850dd9aaef52b212f6271633e93.zip
Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into i#3896
Diffstat (limited to 'app/scripts/controllers/transactions')
-rw-r--r--app/scripts/controllers/transactions/tx-gas-utils.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/controllers/transactions/tx-gas-utils.js b/app/scripts/controllers/transactions/tx-gas-utils.js
index 36b5cdbc9..ab4031faa 100644
--- a/app/scripts/controllers/transactions/tx-gas-utils.js
+++ b/app/scripts/controllers/transactions/tx-gas-utils.js
@@ -126,4 +126,4 @@ class TxGasUtil {
}
}
-module.exports = TxGasUtil \ No newline at end of file
+module.exports = TxGasUtil