Skip to content

Commit d7e5684

Browse files
authored
Fix ESLint configuration by resolving merge conflict
Removed conflicting ESLint configuration and retained the necessary imports. Signed-off-by: Dargon789 <64915515+Dargon789@users.noreply.github.com>
1 parent fd92f3c commit d7e5684

1 file changed

Lines changed: 0 additions & 27 deletions

File tree

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,3 @@
1-
<<<<<<< HEAD
2-
const {
3-
slowImportsCommonIgnoredModules,
4-
} = require("../../config/eslint/constants");
5-
6-
module.exports = {
7-
extends: [`${__dirname}/../../config/eslint/eslintrc.js`],
8-
parserOptions: {
9-
project: `${__dirname}/tsconfig.json`,
10-
sourceType: "module",
11-
},
12-
overrides: [
13-
{
14-
files: ["src/index.ts"],
15-
rules: {
16-
"@nomicfoundation/slow-imports/no-top-level-external-import": [
17-
"error",
18-
{
19-
ignoreModules: [...slowImportsCommonIgnoredModules],
20-
},
21-
],
22-
},
23-
},
24-
],
25-
};
26-
=======
271
const {
282
slowImportsCommonIgnoredModules,
293
} = require("../../config/eslint/constants");
@@ -48,4 +22,3 @@ module.exports = {
4822
},
4923
],
5024
};
51-
>>>>>>> main

0 commit comments

Comments
 (0)