StarMirror/showdown
1
0
Fork 0
mirror of https://github.com/showdownjs/showdown.git synced 2024-03-22 13:30:55 +08:00
Code Issues Projects Releases Wiki Activity

chore: fix merge conflicts

Browse Source
This commit is contained in:
Estevao Soares dos Santos 2018-09-14 14:21:20 +01:00
commit fc7ac1e1ca
2 changed files with 1043 additions and 754 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1793
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
package.json
View File

@ -56,10 +56,10 @@
"semver": "5.4.x", "semver": "5.4.x",
"semver-sort": "0.0.x", "semver-sort": "0.0.x",
"sinon": "^5.1.1", "sinon": "^5.1.1",
"source-map-support": "^0.5.6" "source-map-support": "^0.5.9"
}, },
"dependencies": { "dependencies": {
"jsdom": "^11.0.0", "jsdom": "^11.0.0",
"yargs": "^12.0.0" "yargs": "^12.0.2"
} }
} }