aboutsummaryrefslogtreecommitdiffstats
path: root/.eslintrc
diff options
context:
space:
mode:
authorAlexander Tseung <alextsg@gmail.com>2018-04-03 16:03:31 +0800
committerAlexander Tseung <alextsg@gmail.com>2018-04-03 16:03:31 +0800
commit35875863d2feafc1f653e17e0f58efc2f18ddc46 (patch)
tree5d40581a08201b3f37c7b31fe2aab4675d827f6b /.eslintrc
parent516c1869b0f366a42282a66e14185ce630f883dd (diff)
parentc14ec4191741c444dcf5b7c3e177c17a10374c16 (diff)
downloadtangerine-wallet-browser-35875863d2feafc1f653e17e0f58efc2f18ddc46.tar
tangerine-wallet-browser-35875863d2feafc1f653e17e0f58efc2f18ddc46.tar.gz
tangerine-wallet-browser-35875863d2feafc1f653e17e0f58efc2f18ddc46.tar.bz2
tangerine-wallet-browser-35875863d2feafc1f653e17e0f58efc2f18ddc46.tar.lz
tangerine-wallet-browser-35875863d2feafc1f653e17e0f58efc2f18ddc46.tar.xz
tangerine-wallet-browser-35875863d2feafc1f653e17e0f58efc2f18ddc46.tar.zst
tangerine-wallet-browser-35875863d2feafc1f653e17e0f58efc2f18ddc46.zip
Fix merge conflicts. Modify send workflow
Diffstat (limited to '.eslintrc')
-rw-r--r--.eslintrc4
1 files changed, 3 insertions, 1 deletions
diff --git a/.eslintrc b/.eslintrc
index 4fa7c2d7f..8af71bf4e 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -29,7 +29,8 @@
"plugins": [
"mocha",
"chai",
- "react"
+ "react",
+ "json"
],
"globals": {
@@ -41,6 +42,7 @@
},
"rules": {
+ "no-restricted-globals": ["error", "event"],
"accessor-pairs": 2,
"arrow-spacing": [2, { "before": true, "after": true }],
"block-spacing": [2, "always"],