@itcase/lint 1.0.17 → 1.0.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/eslint/index.js +0 -3
  2. package/package.json +1 -1
package/eslint/index.js CHANGED
@@ -41,12 +41,9 @@ const eslintConfig = [
41
41
  // @typescript-eslint
42
42
  '@typescript-eslint/ban-ts-comment': 'off',
43
43
  '@typescript-eslint/no-explicit-any': 'off',
44
- <<<<<<< HEAD
45
44
  // Sometimes you need an empty one, for example when extends
46
45
  '@typescript-eslint/no-empty-object-type': 'off',
47
- =======
48
46
  "@typescript-eslint/no-unused-expressions": 'off',
49
- >>>>>>> develop
50
47
 
51
48
  // react
52
49
  // TODO: make rule "react/prop-types" as error only for JS(x) files
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@itcase/lint",
3
- "version": "1.0.17",
3
+ "version": "1.0.18",
4
4
  "author": "ITCase",
5
5
  "description": "Code style linter configuration presets",
6
6
  "engines": {