fix merge conflicts

andela · Apr 16, 2018 · 2cd0321 · 2cd0321
1 parent 9a5b245
commit 2cd0321
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -11,7 +11,7 @@
     "rules": {
       "one-var": 0,
       "one-var-declaration-per-line": 0,
-      "max-len": [1, 80, 4],
+      "max-len": [1, 80, 4, { "ignoreStrings": true}],
       "new-cap": 0,
       "no-useless-escape": 0,
       "consistent-return": 0,