Merge branch 'dev'

0xaaiden · Jun 18, 2023 · 5fa5642 · 5fa5642
1 parent 38bb9f5
commit 5fa5642
Show file tree

Hide file tree

Showing 15 changed files with 2 additions and 3,303 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -7,19 +7,9 @@ module.exports = {
   extends: ['eslint:recommended', 'plugin:react/recommended', 'plugin:prettier/recommended'],
   overrides: [],
   parserOptions: {
-<<<<<<< HEAD
     ecmaVersion: 'latest',
     sourceType: 'module'
   },
-=======
-    ecmaFeatures: {
-      jsx: true
-    },
-    ecmaVersion: 12,
-    sourceType: 'module'
-  },
-
->>>>>>> dev
   plugins: ['react'],
   rules: {
     'prettier/prettier': 'warn'