diff options
author | Dan Finlay <dan@danfinlay.com> | 2016-11-22 03:03:32 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2016-11-22 03:03:32 +0800 |
commit | 7ab9d408201ae65ad30512f1361df61a487a9330 (patch) | |
tree | cc7b208d36e9cf6eafcab5bd36edba0f46595a64 /.eslintrc | |
parent | e8a83026248e6e27e6d801cf1713551eb740137a (diff) | |
parent | 7021c7708c927b8723b6ba5842b451b6f46dbb3e (diff) | |
download | tangerine-wallet-browser-7ab9d408201ae65ad30512f1361df61a487a9330.tar.gz tangerine-wallet-browser-7ab9d408201ae65ad30512f1361df61a487a9330.tar.zst tangerine-wallet-browser-7ab9d408201ae65ad30512f1361df61a487a9330.zip |
Merge branch 'dev' into i831-AddRopsten-Dev
Diffstat (limited to '.eslintrc')
-rw-r--r-- | .eslintrc | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -127,9 +127,9 @@ "no-whitespace-before-property": 2, "no-with": 2, "one-var": [2, { "initialized": "never" }], - "operator-linebreak": [1, "after", { "overrides": { "?": "before", ":": "before" } }], + "operator-linebreak": [1, "after", { "overrides": { "?": "ignore", ":": "ignore" } }], "padded-blocks": [1, "never"], - "quotes": [2, "single", "avoid-escape"], + "quotes": [2, "single", {"avoidEscape": true, "allowTemplateLiterals": true}], "semi": [2, "never"], "semi-spacing": [2, { "before": false, "after": true }], "space-before-blocks": [1, "always"], |