diff options
author | kumavis <kumavis@users.noreply.github.com> | 2017-08-09 14:30:58 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-09 14:30:58 +0800 |
commit | 0188e7b94d85b45a783f9e3d5c182a8ffcaeac2e (patch) | |
tree | 428154973b91dfb2f8519777e67da7a6c75530b3 /.eslintrc | |
parent | 5e9926b0d035a5ba946080e94777ac0bd887d396 (diff) | |
parent | 57f6fce6b2524c4b36b591da5e600d0652f4077e (diff) | |
download | tangerine-wallet-browser-0188e7b94d85b45a783f9e3d5c182a8ffcaeac2e.tar.gz tangerine-wallet-browser-0188e7b94d85b45a783f9e3d5c182a8ffcaeac2e.tar.zst tangerine-wallet-browser-0188e7b94d85b45a783f9e3d5c182a8ffcaeac2e.zip |
Merge branch 'master' into NewUI-flat
Diffstat (limited to '.eslintrc')
-rw-r--r-- | .eslintrc | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -50,7 +50,7 @@ "eqeqeq": [2, "allow-null"], "generator-star-spacing": [2, { "before": true, "after": true }], "handle-callback-err": [1, "^(err|error)$" ], - "indent": [2, 2, { "SwitchCase": 1 }], + "indent": "off", "jsx-quotes": [2, "prefer-single"], "key-spacing": 1, "keyword-spacing": [2, { "before": true, "after": true }], @@ -133,7 +133,7 @@ "no-with": 2, "one-var": [2, { "initialized": "never" }], "operator-linebreak": [1, "after", { "overrides": { "?": "ignore", ":": "ignore" } }], - "padded-blocks": [1, "never"], + "padded-blocks": "off", "quotes": [2, "single", {"avoidEscape": true, "allowTemplateLiterals": true}], "semi": [2, "never"], "semi-spacing": [2, { "before": false, "after": true }], |