chore: fix merge conflicts

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

1793
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -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"
}
}