mirror of
https://github.com/showdownjs/showdown.git
synced 2024-03-22 13:30:55 +08:00
chore: fix merge conflicts
This commit is contained in:
commit
fc7ac1e1ca
1793
package-lock.json
generated
1793
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
|
@ -56,10 +56,10 @@
|
|||
"semver": "5.4.x",
|
||||
"semver-sort": "0.0.x",
|
||||
"sinon": "^5.1.1",
|
||||
"source-map-support": "^0.5.6"
|
||||
"source-map-support": "^0.5.9"
|
||||
},
|
||||
"dependencies": {
|
||||
"jsdom": "^11.0.0",
|
||||
"yargs": "^12.0.0"
|
||||
"yargs": "^12.0.2"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user