Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
hinesboy committed Nov 24, 2017
2 parents 353b39a + 98e0f5f commit 3322485
Show file tree
Hide file tree
Showing 267 changed files with 6,209 additions and 39 deletions.
4 changes: 3 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ module.exports = {
'no-unneeded-ternary': 0,
'quotes': 0,
'no-useless-escape': 0,
'no-eval': 0
'no-eval': 0,
// 允许多个空格
'no-multi-spaces': 0
}
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"babel-polyfill": "^6.26.0",
"babel-preset-env": "^1.6.0",
"babel-preset-stage-2": "^6.24.1",
"copy-webpack-plugin": "^4.2.3",
"css-loader": "^0.28.1",
"eslint": "^4.11.0",
"eslint-config-standard": "^10.2.1",
Expand Down
3 changes: 3 additions & 0 deletions resources/highlight.js-9.12.0/highlight.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions resources/highlight.js-9.12.0/languages/1c.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions resources/highlight.js-9.12.0/languages/abnf.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions resources/highlight.js-9.12.0/languages/accesslog.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions resources/highlight.js-9.12.0/languages/ada.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions resources/highlight.js-9.12.0/languages/apache.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions resources/highlight.js-9.12.0/languages/applescript.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions resources/highlight.js-9.12.0/languages/arduino.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions resources/highlight.js-9.12.0/languages/armasm.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions resources/highlight.js-9.12.0/languages/asciidoc.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions resources/highlight.js-9.12.0/languages/aspectj.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions resources/highlight.js-9.12.0/languages/autohotkey.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3322485

Please sign in to comment.