github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-26 15:28:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix package-lock.json merge conflict

Browse Source
This commit is contained in:
Jason Rudolph
2018-09-06 17:04:36 -04:00
parent f3a4cc1d3a
commit cce37f6a44
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package-lock.json generated
View File

@@ -5522,9 +5522,9 @@
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
},
"prebuild-install": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.0.0.tgz",
"integrity": "sha512-AvcPLFqNz/hDd6o7qLj8i9xB479P9jSjA/p6m4927CRfY3tsmPfyFmD7RKXtdp6I2d1BAIVBgJoj5mxRJDZL4w==",
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.1.0.tgz",
"integrity": "sha512-jGdh2Ws5OUCvBm+aQ/je7hgOBfLIFcgnF9DZ1PIEvht0JKfMwn3Gy0MPHL16JcAUI6tu7LX0D3VxmvMm1XZwAw==",
"requires": {
"detect-libc": "^1.0.3",
"expand-template": "^1.0.2",