From cce37f6a44f392f04a0c813720d316fb9eecc74b Mon Sep 17 00:00:00 2001 From: Jason Rudolph Date: Thu, 6 Sep 2018 17:04:36 -0400 Subject: [PATCH] Fix package-lock.json merge conflict --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 04bece656..14ac91e83 100644 --- a/package-lock.json +++ b/package-lock.json @@ -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",