1 files changed, 15 insertions, 0 deletions
diff --git a/package-lock.json b/package-lock.json
index e88b87830..386803b3a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -89,6 +89,8 @@
       "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
       "dev": true
     },
+<<<<<<< HEAD
+=======
     "boom": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
@@ -134,6 +136,7 @@
       "dev": true,
       "optional": true
     },
+>>>>>>> snowdrift
     "coa": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.1.tgz",
@@ -149,6 +152,8 @@
       "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
       "dev": true
     },
+<<<<<<< HEAD
+=======
     "combined-stream": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
@@ -196,6 +201,7 @@
         }
       }
     },
+>>>>>>> snowdrift
     "css-select": {
       "version": "1.3.0-rc0",
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.3.0-rc0.tgz",
@@ -445,6 +451,8 @@
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
       "dev": true
     },
+<<<<<<< HEAD
+=======
     "getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
@@ -486,6 +494,7 @@
         "har-schema": "2.0.0"
       }
     },
+>>>>>>> snowdrift
     "has": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
@@ -584,6 +593,8 @@
         "esprima": "4.0.0"
       }
     },
+<<<<<<< HEAD
+=======
     "jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
@@ -650,6 +661,7 @@
         "clean-css": "3.4.28"
       }
     },
+>>>>>>> snowdrift
     "mdn-data": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.0.tgz",
@@ -824,6 +836,8 @@
       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
       "dev": true
     },
+<<<<<<< HEAD
+=======
     "sntp": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
@@ -841,6 +855,7 @@
       "dev": true,
       "optional": true
     },
+>>>>>>> snowdrift
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",