diff options
| author | Alexander Tseung <alextsg@gmail.com> | 2018-03-27 15:20:35 +0800 |
|---|---|---|
| committer | Alexander Tseung <alextsg@gmail.com> | 2018-03-27 15:20:35 +0800 |
| commit | 6f367a5a6b4fb8918405f233293dc3f4840b4a3d (patch) | |
| tree | c60c01300c90204f8634d1f3e9e79b4ecc2fceda /.eslintrc | |
| parent | 72ffa2c3f5abbcb06c8ab5fdf20b9d934c330692 (diff) | |
| parent | e001c0900b5256c0c8769f0c3eb5d2007f5b18d3 (diff) | |
| download | tangerine-wallet-browser-6f367a5a6b4fb8918405f233293dc3f4840b4a3d.tar.gz tangerine-wallet-browser-6f367a5a6b4fb8918405f233293dc3f4840b4a3d.tar.zst tangerine-wallet-browser-6f367a5a6b4fb8918405f233293dc3f4840b4a3d.zip | |
Fix merge conflicts
Diffstat (limited to '.eslintrc')
| -rw-r--r-- | .eslintrc | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -148,7 +148,7 @@ "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", "!", ","] }], + "spaced-comment": [2, "always", { "markers": ["global", "globals", "eslint", "eslint-disable", "*package", "!", ","], "exceptions": ["=", "-"] } ], "strict": 0, "template-curly-spacing": [2, "never"], "use-isnan": 2, |