Merge branch 'master' into selenium-e2e

1 files changed, 1 insertions, 1 deletions

diff --git a/.eslintrc b/.eslintrc
index 20a2a7a00..4fa7c2d7f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -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,