fix: git conflicts

eslint · Apr 11, 2024 · 06a8da6 · 06a8da6
1 parent d59bc59
commit 06a8da6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,7 @@ jsdoc/
 .cache
 /packages/**/node_modules
 /tools/internal-rules/node_modules
+/.vscode
 .sublimelinterrc
 .eslint-release-info.json
 .nyc_output

diff --git a/packages/eslint-config-eslint/package.json b/packages/eslint-config-eslint/package.json
@@ -7,8 +7,7 @@
  "./package.json": "./package.json",
  ".": "./index.js",
  "./base": "./base.js",
- "./cjs": "./cjs.js",
- "./eslintrc": "./eslintrc.js"
+ "./cjs": "./cjs.js"
  },
  "scripts": {
  "test": "node ./index.js && node ./cjs.js",