resolve conflicts

SolidOS · Jan 30, 2023 · 1a06a54 · 1a06a54
1 parent f4b36c0
commit 1a06a54
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16,952 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,8 +1,8 @@
 {
-  "parserOptions": { 
+  /* "parserOptions": { 
     "ecmaVersion": 6,  
     "sourceType": "module"
-  },
+  }, */
   "root": true,
   "env": {
     "browser": true,