Merge remote-tracking branch 'origin/develop' into merge-master
This commit is contained in:
commit
e839e57173
|
@ -16,8 +16,7 @@
|
|||
"dist",
|
||||
"public",
|
||||
"*.spec.js",
|
||||
"bundle.js",
|
||||
"packages/pro"
|
||||
"bundle.js"
|
||||
],
|
||||
"plugins": ["svelte3"],
|
||||
"extends": ["eslint:recommended"],
|
||||
|
@ -30,9 +29,7 @@
|
|||
"files": ["**/*.ts"],
|
||||
"parser": "@typescript-eslint/parser",
|
||||
"plugins": [],
|
||||
"extends": [
|
||||
"eslint:recommended"
|
||||
],
|
||||
"extends": ["eslint:recommended"],
|
||||
"rules": {
|
||||
"no-unused-vars": "off",
|
||||
"no-inner-declarations": "off",
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit d99e1baee70edf726bcc1a83684bf9bd641d04de
|
||||
Subproject commit 544c7e067de69832469cde673e59501480d6d98a
|
Loading…
Reference in New Issue