Merge
This commit is contained in:
parent
4459eb5c87
commit
0c472d97bd
|
@ -13,13 +13,8 @@
|
||||||
},
|
},
|
||||||
"sourceType": "module"
|
"sourceType": "module"
|
||||||
},
|
},
|
||||||
<<<<<<< HEAD
|
|
||||||
"extends": ["eslint:recommended", "plugin:jsdoc/recommended", "plugin:prettier/recommended"],
|
|
||||||
"plugins": ["html", "jest", "jsdoc", "prettier"],
|
|
||||||
=======
|
|
||||||
"extends": ["eslint:recommended", "plugin:jsdoc/recommended", "plugin:markdown/recommended", "plugin:prettier/recommended"],
|
"extends": ["eslint:recommended", "plugin:jsdoc/recommended", "plugin:markdown/recommended", "plugin:prettier/recommended"],
|
||||||
"plugins": ["jest", "jsdoc", "prettier"],
|
"plugins": ["jest", "jsdoc", "prettier"],
|
||||||
>>>>>>> develop
|
|
||||||
"rules": {
|
"rules": {
|
||||||
"no-prototype-builtins": 0,
|
"no-prototype-builtins": 0,
|
||||||
"no-unused-vars": 0,
|
"no-unused-vars": 0,
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -115,14 +115,5 @@
|
||||||
"sideEffects": [
|
"sideEffects": [
|
||||||
"**/*.css",
|
"**/*.css",
|
||||||
"**/*.scss"
|
"**/*.scss"
|
||||||
<<<<<<< HEAD
|
|
||||||
],
|
|
||||||
"husky": {
|
|
||||||
"hooks": {
|
|
||||||
"pre-push": "yarn test"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
=======
|
|
||||||
]
|
]
|
||||||
>>>>>>> develop
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue