Skip to content

Commit 8593d5b

Browse files
committed
Merge branch 'develop' into feature/stylint
2 parents d10dfec + 4cf9eb3 commit 8593d5b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

docs/structure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
├── .babelrc # babel config
3232
├── .editorconfig # indentation, spaces/tabs and similar settings for your editor
3333
├── .eslintrc.js # eslint config
34-
├── .eslintignore.js # eslint ignore rules
34+
├── .eslintignore # eslint ignore rules
3535
├── .gitignore # sensible defaults for gitignore
3636
├── .postcssrc.js # postcss config
3737
├── .stylelintrc.js # stylelint config

meta.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ module.exports = {
150150
".stylelintrc.js": "stylelint",
151151
".stylelintignore": "stylelint",
152152
"config/test.env.js": "unit || e2e",
153-
"build/webpack.test.conf.js": "e2e || (unit && runner === 'karma')",
153+
"build/webpack.test.conf.js": "unit && runner === 'karma'",
154154
"test/unit/**/*": "unit",
155155
"test/unit/index.js": "unit && runner === 'karma'",
156156
"test/unit/jest.conf.js": "unit && runner === 'jest'",

0 commit comments

Comments
 (0)