mirrors
/
mermaid
mirror of https://github.com/mermaid-js/mermaid.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge

This commit is contained in:
Knut Sveidqvist 2021-12-11 08:42:58 +01:00
parent 4459eb5c87
commit 0c472d97bd
5 changed files with 233 additions and 4099 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.eslintrc.json
View File

@ -13,13 +13,8 @@
},
"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"],
"plugins": ["jest", "jsdoc", "prettier"],
>>>>>>> develop
"rules": {
"no-prototype-builtins": 0,
"no-unused-vars": 0,

4310
dist/mermaid.core.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/mermaid.core.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
dist/mermaid.esm.min.mjs vendored
View File

File diff suppressed because one or more lines are too long

9
package.json
View File

@ -115,14 +115,5 @@
"sideEffects": [
"**/*.css",
"**/*.scss"
<<<<<<< HEAD
],
"husky": {
"hooks": {
"pre-push": "yarn test"
}
}
=======
]
>>>>>>> develop
}