Resolve conflicts

2020-04-12 21:46:11 -04:00
parent df6b9b13ac
commit 375f046cfa
5 changed files with 35 additions and 78 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -3,6 +3,7 @@ module.exports = {
  env: {
    browser: true,
    es6: true,
+    jest: true,
  },
  extends: 'airbnb',
  parserOptions: {
@@ -65,6 +66,7 @@ module.exports = {
      {
        "maximum": 1
      }
-    ]
+    ],
+    "linebreak-style": ["off"]
  },
 };