diff options
| author | Frankie <frankie.pangilinan@consensys.net> | 2016-09-16 09:16:41 +0800 |
|---|---|---|
| committer | Frankie <frankie.pangilinan@consensys.net> | 2016-09-16 09:16:41 +0800 |
| commit | dcda841f4d33f96a5620b2458decd94339d5ee52 (patch) | |
| tree | 07cce20fe4474c2424026703a4482b2867eb5beb /.eslintrc | |
| parent | bc33c88ae53fbc08e75db025888d5bc3bcfe236d (diff) | |
| parent | a5e45820cc7359491d1d7b06a5358d99b9c97305 (diff) | |
| download | tangerine-wallet-browser-dcda841f4d33f96a5620b2458decd94339d5ee52.tar tangerine-wallet-browser-dcda841f4d33f96a5620b2458decd94339d5ee52.tar.gz tangerine-wallet-browser-dcda841f4d33f96a5620b2458decd94339d5ee52.tar.bz2 tangerine-wallet-browser-dcda841f4d33f96a5620b2458decd94339d5ee52.tar.lz tangerine-wallet-browser-dcda841f4d33f96a5620b2458decd94339d5ee52.tar.xz tangerine-wallet-browser-dcda841f4d33f96a5620b2458decd94339d5ee52.tar.zst tangerine-wallet-browser-dcda841f4d33f96a5620b2458decd94339d5ee52.zip | |
Merge branch 'master' into tx-viz
Diffstat (limited to '.eslintrc')
| -rw-r--r-- | .eslintrc | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -127,14 +127,14 @@ "no-whitespace-before-property": 2, "no-with": 2, "one-var": [2, { "initialized": "never" }], - "operator-linebreak": [2, "after", { "overrides": { "?": "before", ":": "before" } }], + "operator-linebreak": [1, "after", { "overrides": { "?": "before", ":": "before" } }], "padded-blocks": [1, "never"], "quotes": [2, "single", "avoid-escape"], "semi": [2, "never"], "semi-spacing": [2, { "before": false, "after": true }], "space-before-blocks": [1, "always"], "space-before-function-paren": [1, "always"], - "space-in-parens": [2, "never"], + "space-in-parens": [1, "never"], "space-infix-ops": 2, "space-unary-ops": [2, { "words": true, "nonwords": false }], "spaced-comment": [2, "always", { "markers": ["global", "globals", "eslint", "eslint-disable", "*package", "!", ","] }], |