diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-01-17 07:02:24 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-17 07:02:24 +0800 |
| commit | ee62a6a3913967a6840d28ca812b94bbfa7a5779 (patch) | |
| tree | cac32de6cc520917db9621ce93f7f4ad9abd787e /.eslintrc | |
| parent | e8e06542e47b41668f196b6db54290490003845b (diff) | |
| parent | 88fabdd2de78d0dd4be86b02c94a64d9748667fa (diff) | |
| download | tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.tar.gz tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.tar.zst tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.zip | |
Merge pull request #1005 from MetaMask/dev
Merge dev into master!
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"], |