Merge Conflict resolution .elsintrc.json

sugarlabs · Jan 26, 2021 · e4c7eb7 · e4c7eb7
1 parent a9fb12e
commit e4c7eb7
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -4,6 +4,12 @@
     "browser": true
   },
   "parser": "babel-eslint",
+  "parserOptions": {
+    "sourceType": "script",
+    "ecmaFeatures": {
+      "globalReturn": false
+    }
+  },
   "extends": ["eslint:recommended", "prettier"],
   "rules": {
     "no-console": "warn",