diff options
| author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-01-19 05:14:27 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-19 05:14:27 +0800 |
| commit | 25e57939920d4685a20b4e7b3a14060e9d3314c7 (patch) | |
| tree | fa3c5f2811912a18ce9811c5c850bb4ec25ffbb1 /.eslintrc | |
| parent | 9ab7ce370bc12e10b3458c0755f0dd8488788bec (diff) | |
| parent | 0e01abdf7154067ca50bf279340b868aefd8343f (diff) | |
| download | tangerine-wallet-browser-25e57939920d4685a20b4e7b3a14060e9d3314c7.tar.gz tangerine-wallet-browser-25e57939920d4685a20b4e7b3a14060e9d3314c7.tar.zst tangerine-wallet-browser-25e57939920d4685a20b4e7b3a14060e9d3314c7.zip | |
Merge pull request #1027 from MetaMask/Version-3.1.0v3.1.0
Version 3.1.0
Diffstat (limited to '.eslintrc')
| -rw-r--r-- | .eslintrc | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,5 +1,6 @@ { "parserOptions": { + "sourceType": "module", "ecmaVersion": 6, "ecmaFeatures": { "experimentalObjectRestSpread": true, @@ -44,7 +45,7 @@ "eol-last": 1, "eqeqeq": [2, "allow-null"], "generator-star-spacing": [2, { "before": true, "after": true }], - "handle-callback-err": [2, "^(err|error)$" ], + "handle-callback-err": [1, "^(err|error)$" ], "indent": [2, 2, { "SwitchCase": 1 }], "jsx-quotes": [2, "prefer-single"], "key-spacing": [2, { "beforeColon": false, "afterColon": true }], @@ -145,6 +146,6 @@ "wrap-iife": [2, "any"], "yield-star-spacing": [2, "both"], "yoda": [2, "never"], - "prefer-const": 1 + "prefer-const": 1, } } |