From f8482d718dbdb20acf9a770bacc21edb4ba35edb Mon Sep 17 00:00:00 2001 From: Eric Weitz Date: Sun, 20 Aug 2017 22:22:27 -0400 Subject: [PATCH] Fix missed conflicts in package metadata --- package-lock.json | 2967 +-------------------------------------------- package.json | 2 +- 2 files changed, 2 insertions(+), 2967 deletions(-) diff --git a/package-lock.json b/package-lock.json index f5de622d..3a83d6ec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,14 +1,6 @@ { "name": "ideogram", -<<<<<<< HEAD -<<<<<<< HEAD - "version": "0.6.1", -======= "version": "0.7.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "version": "0.7.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "lockfileVersion": 1, "requires": true, "dependencies": { @@ -103,18 +95,6 @@ "integrity": "sha1-W65SvkJIeN2Xg+iRDj/Cki6DyBs=", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "ansi-html": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz", - "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "ansi-regex": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", @@ -128,18 +108,6 @@ "dev": true }, "anymatch": { -<<<<<<< HEAD -<<<<<<< HEAD - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz", - "integrity": "sha1-o+Uvo5FoyCX/V7AkgSbOWo/5VQc=", - "dev": true, - "requires": { - "arrify": "1.0.1", - "micromatch": "2.3.11" -======= -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "version": "1.3.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", @@ -147,10 +115,6 @@ "requires": { "micromatch": "2.3.11", "normalize-path": "2.1.1" -<<<<<<< HEAD ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 } }, "argparse": { @@ -177,24 +141,6 @@ "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "array-find-index": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", - "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", - "dev": true - }, - "array-flatten": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz", - "integrity": "sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "array-slice": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz", @@ -297,15 +243,7 @@ "babel-helpers": "6.24.1", "babel-messages": "6.23.0", "babel-register": "6.24.1", -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-template": "6.25.0", "babel-traverse": "6.25.0", "babel-types": "6.25.0", @@ -328,15 +266,7 @@ "dev": true, "requires": { "babel-messages": "6.23.0", -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-types": "6.25.0", "detect-indent": "4.0.0", "jsesc": "1.3.0", @@ -352,15 +282,7 @@ "dev": true, "requires": { "babel-helper-explode-assignable-expression": "6.24.1", -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-types": "6.25.0" } }, @@ -371,15 +293,7 @@ "dev": true, "requires": { "babel-helper-hoist-variables": "6.24.1", -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-traverse": "6.25.0", "babel-types": "6.25.0" } @@ -391,15 +305,7 @@ "dev": true, "requires": { "babel-helper-function-name": "6.24.1", -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-types": "6.25.0", "lodash": "4.17.4" } @@ -410,15 +316,7 @@ "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", "dev": true, "requires": { -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-traverse": "6.25.0", "babel-types": "6.25.0" } @@ -430,15 +328,7 @@ "dev": true, "requires": { "babel-helper-get-function-arity": "6.24.1", -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-template": "6.25.0", "babel-traverse": "6.25.0", "babel-types": "6.25.0" @@ -450,15 +340,7 @@ "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", "dev": true, "requires": { -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-types": "6.25.0" } }, @@ -468,15 +350,7 @@ "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", "dev": true, "requires": { -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-types": "6.25.0" } }, @@ -486,15 +360,7 @@ "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=", "dev": true, "requires": { -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-types": "6.25.0" } }, @@ -504,15 +370,7 @@ "integrity": "sha1-024i+rEAjXnYhkjjIRaGgShFbOg=", "dev": true, "requires": { -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-types": "6.25.0", "lodash": "4.17.4" } @@ -524,15 +382,7 @@ "dev": true, "requires": { "babel-helper-function-name": "6.24.1", -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-template": "6.25.0", "babel-traverse": "6.25.0", "babel-types": "6.25.0" @@ -546,15 +396,7 @@ "requires": { "babel-helper-optimise-call-expression": "6.24.1", "babel-messages": "6.23.0", -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-template": "6.25.0", "babel-traverse": "6.25.0", "babel-types": "6.25.0" @@ -566,15 +408,7 @@ "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", "dev": true, "requires": { -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-template": "6.25.0" } }, @@ -595,15 +429,7 @@ "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", "dev": true, "requires": { -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0" -======= "babel-runtime": "6.25.0" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "babel-runtime": "6.25.0" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 } }, "babel-plugin-check-es2015-constants": { @@ -612,15 +438,7 @@ "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", "dev": true, "requires": { -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0" -======= - "babel-runtime": "6.25.0" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "babel-runtime": "6.25.0" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 } }, "babel-plugin-syntax-async-functions": { @@ -649,15 +467,7 @@ "requires": { "babel-helper-remap-async-to-generator": "6.24.1", "babel-plugin-syntax-async-functions": "6.13.0", -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0" -======= "babel-runtime": "6.25.0" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "babel-runtime": "6.25.0" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 } }, "babel-plugin-transform-es2015-arrow-functions": { @@ -666,15 +476,7 @@ "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=", "dev": true, "requires": { -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0" -======= - "babel-runtime": "6.25.0" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "babel-runtime": "6.25.0" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 } }, "babel-plugin-transform-es2015-block-scoped-functions": { @@ -683,15 +485,7 @@ "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=", "dev": true, "requires": { -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0" -======= "babel-runtime": "6.25.0" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "babel-runtime": "6.25.0" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 } }, "babel-plugin-transform-es2015-block-scoping": { @@ -700,15 +494,7 @@ "integrity": "sha1-dsKV3DpHQbFmWt/TFnIV3P8ypXY=", "dev": true, "requires": { -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-template": "6.25.0", "babel-traverse": "6.25.0", "babel-types": "6.25.0", @@ -726,15 +512,7 @@ "babel-helper-optimise-call-expression": "6.24.1", "babel-helper-replace-supers": "6.24.1", "babel-messages": "6.23.0", -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-template": "6.25.0", "babel-traverse": "6.25.0", "babel-types": "6.25.0" @@ -746,15 +524,7 @@ "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=", "dev": true, "requires": { -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-template": "6.25.0" } }, @@ -764,15 +534,7 @@ "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", "dev": true, "requires": { -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0" -======= "babel-runtime": "6.25.0" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "babel-runtime": "6.25.0" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 } }, "babel-plugin-transform-es2015-duplicate-keys": { @@ -781,15 +543,7 @@ "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=", "dev": true, "requires": { -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-types": "6.25.0" } }, @@ -799,15 +553,7 @@ "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=", "dev": true, "requires": { -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0" -======= "babel-runtime": "6.25.0" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "babel-runtime": "6.25.0" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 } }, "babel-plugin-transform-es2015-function-name": { @@ -817,15 +563,7 @@ "dev": true, "requires": { "babel-helper-function-name": "6.24.1", -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-types": "6.25.0" } }, @@ -835,15 +573,7 @@ "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=", "dev": true, "requires": { -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0" -======= "babel-runtime": "6.25.0" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "babel-runtime": "6.25.0" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 } }, "babel-plugin-transform-es2015-modules-amd": { @@ -853,15 +583,7 @@ "dev": true, "requires": { "babel-plugin-transform-es2015-modules-commonjs": "6.24.1", -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-template": "6.25.0" } }, @@ -872,15 +594,7 @@ "dev": true, "requires": { "babel-plugin-transform-strict-mode": "6.24.1", -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-template": "6.25.0", "babel-types": "6.25.0" } @@ -892,15 +606,7 @@ "dev": true, "requires": { "babel-helper-hoist-variables": "6.24.1", -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-template": "6.25.0" } }, @@ -911,15 +617,7 @@ "dev": true, "requires": { "babel-plugin-transform-es2015-modules-amd": "6.24.1", -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-template": "6.25.0" } }, @@ -930,15 +628,7 @@ "dev": true, "requires": { "babel-helper-replace-supers": "6.24.1", -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0" -======= - "babel-runtime": "6.25.0" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "babel-runtime": "6.25.0" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 } }, "babel-plugin-transform-es2015-parameters": { @@ -949,15 +639,7 @@ "requires": { "babel-helper-call-delegate": "6.24.1", "babel-helper-get-function-arity": "6.24.1", -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-template": "6.25.0", "babel-traverse": "6.25.0", "babel-types": "6.25.0" @@ -969,15 +651,7 @@ "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=", "dev": true, "requires": { -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-types": "6.25.0" } }, @@ -987,15 +661,7 @@ "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", "dev": true, "requires": { -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0" -======= "babel-runtime": "6.25.0" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "babel-runtime": "6.25.0" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 } }, "babel-plugin-transform-es2015-sticky-regex": { @@ -1005,15 +671,7 @@ "dev": true, "requires": { "babel-helper-regex": "6.24.1", -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-types": "6.25.0" } }, @@ -1023,15 +681,7 @@ "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=", "dev": true, "requires": { -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0" -======= "babel-runtime": "6.25.0" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "babel-runtime": "6.25.0" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 } }, "babel-plugin-transform-es2015-typeof-symbol": { @@ -1040,15 +690,7 @@ "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=", "dev": true, "requires": { -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0" -======= - "babel-runtime": "6.25.0" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "babel-runtime": "6.25.0" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 } }, "babel-plugin-transform-es2015-unicode-regex": { @@ -1058,15 +700,7 @@ "dev": true, "requires": { "babel-helper-regex": "6.24.1", -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "regexpu-core": "2.0.0" } }, @@ -1078,15 +712,7 @@ "requires": { "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1", "babel-plugin-syntax-exponentiation-operator": "6.13.0", -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0" -======= - "babel-runtime": "6.25.0" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "babel-runtime": "6.25.0" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 } }, "babel-plugin-transform-regenerator": { @@ -1104,15 +730,7 @@ "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", "dev": true, "requires": { -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-types": "6.25.0" } }, @@ -1161,15 +779,7 @@ "dev": true, "requires": { "babel-core": "6.25.0", -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "core-js": "2.4.1", "home-or-tmp": "2.0.0", "lodash": "4.17.4", @@ -1178,21 +788,9 @@ } }, "babel-runtime": { -<<<<<<< HEAD -<<<<<<< HEAD - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz", - "integrity": "sha1-CpSJ8UTecO+zzkMArM2zKeL8VDs=", -======= - "version": "6.25.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.25.0.tgz", - "integrity": "sha1-M7mOql1IK7AajRqmtDetKwGuxBw=", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "version": "6.25.0", "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.25.0.tgz", "integrity": "sha1-M7mOql1IK7AajRqmtDetKwGuxBw=", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "requires": { "core-js": "2.4.1", @@ -1205,15 +803,7 @@ "integrity": "sha1-ZlJBFmt8KqTGGdceGSlpVSsQwHE=", "dev": true, "requires": { -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-traverse": "6.25.0", "babel-types": "6.25.0", "babylon": "6.17.4", @@ -1228,15 +818,7 @@ "requires": { "babel-code-frame": "6.22.0", "babel-messages": "6.23.0", -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-types": "6.25.0", "babylon": "6.17.4", "debug": "2.6.8", @@ -1251,15 +833,7 @@ "integrity": "sha1-cK+ySNVmDl0Y+BHZHIMDtUE0oY4=", "dev": true, "requires": { -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "esutils": "2.0.2", "lodash": "4.17.4", "to-fast-properties": "1.0.3" @@ -1301,18 +875,6 @@ "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "batch": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", - "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "better-assert": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz", @@ -1361,15 +923,7 @@ "bytes": "2.4.0", "content-type": "1.0.2", "debug": "2.6.7", -<<<<<<< HEAD -<<<<<<< HEAD - "depd": "1.1.0", -======= - "depd": "1.1.1", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "depd": "1.1.1", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "http-errors": "1.6.1", "iconv-lite": "0.4.15", "on-finished": "2.3.0", @@ -1395,26 +949,6 @@ } } }, -<<<<<<< HEAD -<<<<<<< HEAD - "bonjour": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz", - "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=", - "dev": true, - "requires": { - "array-flatten": "2.1.1", - "deep-equal": "1.0.1", - "dns-equal": "1.0.0", - "dns-txt": "2.0.2", - "multicast-dns": "6.1.1", - "multicast-dns-service-types": "1.1.0" - } - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "brace-expansion": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", @@ -1517,15 +1051,7 @@ "integrity": "sha512-MejxGMNIeIqzgaMKVYfFTWHinrwZOnWMXteN9VlHinTd13/0aDmXY9uyRqNsCTnVxqRmrjQFcXI7cy0q9K1IYg==", "dev": true, "requires": { -<<<<<<< HEAD -<<<<<<< HEAD - "caniuse-lite": "1.0.30000704", -======= - "caniuse-lite": "1.0.30000708", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "caniuse-lite": "1.0.30000708", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "electron-to-chromium": "1.3.16" } }, @@ -1540,18 +1066,6 @@ "isarray": "1.0.0" } }, -<<<<<<< HEAD -<<<<<<< HEAD - "buffer-indexof": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.0.tgz", - "integrity": "sha1-9U9kfE9OJSKLqmVqLlfkPV8nCYI=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "buffer-xor": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", @@ -1603,41 +1117,10 @@ "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "camelcase-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", - "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", - "dev": true, - "requires": { - "camelcase": "2.1.1", - "map-obj": "1.0.1" - }, - "dependencies": { - "camelcase": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", - "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", - "dev": true - } - } - }, - "caniuse-lite": { - "version": "1.0.30000704", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000704.tgz", - "integrity": "sha1-rbbqARNFFWY2gtuTq6spHUwClGs=", -======= -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "caniuse-lite": { "version": "1.0.30000708", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000708.tgz", "integrity": "sha1-cdvziMV/N5sbtmyJqJDtwEwlCbY=", -<<<<<<< HEAD ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true }, "center-align": { @@ -1680,15 +1163,7 @@ "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", "dev": true, "requires": { -<<<<<<< HEAD -<<<<<<< HEAD - "anymatch": "1.3.0", -======= - "anymatch": "1.3.2", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "anymatch": "1.3.2", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "async-each": "1.0.1", "fsevents": "1.1.2", "glob-parent": "2.0.0", @@ -1820,44 +1295,6 @@ "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "compressible": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.10.tgz", - "integrity": "sha1-/tocf3YXkScyspv4zyYlKiC57s0=", - "dev": true, - "requires": { - "mime-db": "1.29.0" - } - }, - "compression": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.0.tgz", - "integrity": "sha1-AwyfGY8WQ6BX13anOOki2kNzAS0=", - "dev": true, - "requires": { - "accepts": "1.3.3", - "bytes": "2.5.0", - "compressible": "2.0.10", - "debug": "2.6.8", - "on-headers": "1.0.1", - "safe-buffer": "5.1.1", - "vary": "1.1.1" - }, - "dependencies": { - "bytes": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.5.0.tgz", - "integrity": "sha1-TJQj6i0lLCcMQbK97+/5u2tiwGo=", - "dev": true - } - } - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -1898,18 +1335,6 @@ } } }, -<<<<<<< HEAD -<<<<<<< HEAD - "connect-history-api-fallback": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz", - "integrity": "sha1-5R0X+PDvDbkKZP20feMFFVbp8Wk=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "console-browserify": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", @@ -1925,18 +1350,6 @@ "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "content-disposition": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", - "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "content-type": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz", @@ -1955,18 +1368,6 @@ "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "core-js": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz", @@ -2044,21 +1445,6 @@ "randombytes": "2.0.5" } }, -<<<<<<< HEAD -<<<<<<< HEAD - "currently-unhandled": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", - "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", - "dev": true, - "requires": { - "array-find-index": "1.0.2" - } - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "custom-event": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz", @@ -2386,18 +1772,6 @@ } } }, -<<<<<<< HEAD -<<<<<<< HEAD - "deep-equal": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", - "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "deep-is": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", @@ -2420,21 +1794,9 @@ } }, "depd": { -<<<<<<< HEAD -<<<<<<< HEAD - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz", - "integrity": "sha1-4b2Cxqq2ztlluXuIsX7T5SjKGMM=", -======= "version": "1.1.1", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz", "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz", - "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true }, "des.js": { @@ -2447,18 +1809,6 @@ "minimalistic-assert": "1.0.0" } }, -<<<<<<< HEAD -<<<<<<< HEAD - "destroy": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", - "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "detect-indent": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", @@ -2468,18 +1818,6 @@ "repeating": "2.0.1" } }, -<<<<<<< HEAD -<<<<<<< HEAD - "detect-node": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.3.tgz", - "integrity": "sha1-ogM8CcyOFY03dI+951B4Mr1s4Sc=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "di": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz", @@ -2503,37 +1841,6 @@ "randombytes": "2.0.5" } }, -<<<<<<< HEAD -<<<<<<< HEAD - "dns-equal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", - "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=", - "dev": true - }, - "dns-packet": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.1.1.tgz", - "integrity": "sha1-I2nUUDivBF84mOb6VoYq7T9AKWw=", - "dev": true, - "requires": { - "ip": "1.1.5", - "safe-buffer": "5.1.1" - } - }, - "dns-txt": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz", - "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=", - "dev": true, - "requires": { - "buffer-indexof": "1.1.0" - } - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "doctrine": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz", @@ -2850,15 +2157,7 @@ "imurmurhash": "0.1.4", "inquirer": "3.2.1", "is-resolvable": "1.0.0", -<<<<<<< HEAD -<<<<<<< HEAD - "js-yaml": "3.9.0", -======= - "js-yaml": "3.9.1", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "js-yaml": "3.9.1", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "json-stable-stringify": "1.0.1", "levn": "0.3.0", "lodash": "4.17.4", @@ -2960,18 +2259,6 @@ "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "etag": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.0.tgz", - "integrity": "sha1-b2Ma7zNtbEY2K1F2QETOIWvjwFE=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "event-emitter": { "version": "0.3.5", "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", @@ -2994,21 +2281,6 @@ "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "eventsource": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-0.1.6.tgz", - "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=", - "dev": true, - "requires": { - "original": "1.0.0" - } - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "evp_bytestokey": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz", @@ -3018,11 +2290,6 @@ "create-hash": "1.1.3" } }, -<<<<<<< HEAD -<<<<<<< HEAD -======= -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "execa": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", @@ -3038,10 +2305,6 @@ "strip-eof": "1.0.0" } }, -<<<<<<< HEAD ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "expand-braces": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz", @@ -3104,65 +2367,6 @@ "fill-range": "2.2.3" } }, -<<<<<<< HEAD -<<<<<<< HEAD - "express": { - "version": "4.15.3", - "resolved": "https://registry.npmjs.org/express/-/express-4.15.3.tgz", - "integrity": "sha1-urZdDwOqgMNYQIly/HAPkWlEtmI=", - "dev": true, - "requires": { - "accepts": "1.3.3", - "array-flatten": "1.1.1", - "content-disposition": "0.5.2", - "content-type": "1.0.2", - "cookie": "0.3.1", - "cookie-signature": "1.0.6", - "debug": "2.6.7", - "depd": "1.1.0", - "encodeurl": "1.0.1", - "escape-html": "1.0.3", - "etag": "1.8.0", - "finalhandler": "1.0.3", - "fresh": "0.5.0", - "merge-descriptors": "1.0.1", - "methods": "1.1.2", - "on-finished": "2.3.0", - "parseurl": "1.3.1", - "path-to-regexp": "0.1.7", - "proxy-addr": "1.1.5", - "qs": "6.4.0", - "range-parser": "1.2.0", - "send": "0.15.3", - "serve-static": "1.12.3", - "setprototypeof": "1.0.3", - "statuses": "1.3.1", - "type-is": "1.6.15", - "utils-merge": "1.0.0", - "vary": "1.1.1" - }, - "dependencies": { - "array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=", - "dev": true - }, - "debug": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz", - "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4=", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } - } - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "extend": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", @@ -3201,21 +2405,6 @@ "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "faye-websocket": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz", - "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", - "dev": true, - "requires": { - "websocket-driver": "0.6.5" - } - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "figures": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", @@ -3327,24 +2516,6 @@ "for-in": "1.0.2" } }, -<<<<<<< HEAD -<<<<<<< HEAD - "forwarded": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz", - "integrity": "sha1-Ge+YdMSuHCl7zweP3mOgm2aoQ2M=", - "dev": true - }, - "fresh": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz", - "integrity": "sha1-9HTKXmqSRtb9jglTz6m5yAWvp44=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "fs-access": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz", @@ -3373,31 +2544,13 @@ "dependencies": { "abbrev": { "version": "1.1.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz", - "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "ajv": { "version": "4.11.8", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", - "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -3407,45 +2560,18 @@ }, "ansi-regex": { "version": "2.1.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true }, "aproba": { "version": "1.1.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz", - "integrity": "sha1-ldNgDwdxCqDpKYxyatXs8urLq6s=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "are-we-there-yet": { "version": "1.1.4", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz", - "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -3455,105 +2581,42 @@ }, "asn1": { "version": "0.2.3", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", - "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "assert-plus": { "version": "0.2.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", - "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "asynckit": { "version": "0.4.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "aws-sign2": { "version": "0.6.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", - "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "aws4": { "version": "1.6.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", - "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "balanced-match": { "version": "0.4.2", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true }, "bcrypt-pbkdf": { "version": "1.0.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", - "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -3562,16 +2625,7 @@ }, "block-stream": { "version": "0.0.9", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", - "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "requires": { "inherits": "2.0.3" @@ -3579,16 +2633,7 @@ }, "boom": { "version": "2.10.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", - "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "requires": { "hoek": "2.16.3" @@ -3596,16 +2641,7 @@ }, "brace-expansion": { "version": "1.1.7", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz", - "integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "requires": { "balanced-match": "0.4.2", @@ -3614,74 +2650,29 @@ }, "buffer-shims": { "version": "1.0.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", - "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true }, "caseless": { "version": "0.12.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "co": { "version": "4.6.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "code-point-at": { "version": "1.1.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true }, "combined-stream": { "version": "1.0.5", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", - "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "requires": { "delayed-stream": "1.0.0" @@ -3689,58 +2680,22 @@ }, "concat-map": { "version": "0.0.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true }, "console-control-strings": { "version": "1.1.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true }, "core-util-is": { "version": "1.0.2", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true }, "cryptiles": { "version": "2.0.5", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", - "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -3749,16 +2704,7 @@ }, "dashdash": { "version": "1.14.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -3767,16 +2713,7 @@ "dependencies": { "assert-plus": { "version": "1.0.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true } @@ -3784,16 +2721,7 @@ }, "debug": { "version": "2.6.8", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", - "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -3802,60 +2730,24 @@ }, "deep-extend": { "version": "0.4.2", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", - "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "delayed-stream": { "version": "1.0.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true }, "delegates": { "version": "1.0.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "ecc-jsbn": { "version": "0.1.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", - "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -3864,60 +2756,24 @@ }, "extend": { "version": "3.0.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", - "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "extsprintf": { "version": "1.0.2", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz", - "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true }, "forever-agent": { "version": "0.6.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "form-data": { "version": "2.1.4", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", - "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -3928,30 +2784,12 @@ }, "fs.realpath": { "version": "1.0.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true }, "fstream": { "version": "1.0.11", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", - "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "requires": { "graceful-fs": "4.1.11", @@ -3962,16 +2800,7 @@ }, "fstream-ignore": { "version": "1.0.5", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz", - "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -3982,16 +2811,7 @@ }, "gauge": { "version": "2.7.4", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -4007,16 +2827,7 @@ }, "getpass": { "version": "0.1.7", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -4025,16 +2836,7 @@ "dependencies": { "assert-plus": { "version": "1.0.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true } @@ -4042,16 +2844,7 @@ }, "glob": { "version": "7.1.2", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "requires": { "fs.realpath": "1.0.0", @@ -4064,45 +2857,18 @@ }, "graceful-fs": { "version": "4.1.11", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true }, "har-schema": { "version": "1.0.5", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", - "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "har-validator": { "version": "4.2.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", - "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -4112,31 +2878,13 @@ }, "has-unicode": { "version": "2.0.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "hawk": { "version": "3.1.3", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", - "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -4148,30 +2896,12 @@ }, "hoek": { "version": "2.16.3", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", - "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true }, "http-signature": { "version": "1.1.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", - "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -4182,16 +2912,7 @@ }, "inflight": { "version": "1.0.6", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "requires": { "once": "1.4.0", @@ -4200,45 +2921,18 @@ }, "inherits": { "version": "2.0.3", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true }, "ini": { "version": "1.3.4", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz", - "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "is-fullwidth-code-point": { "version": "1.0.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "requires": { "number-is-nan": "1.0.1" @@ -4246,60 +2940,24 @@ }, "is-typedarray": { "version": "1.0.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "isarray": { "version": "1.0.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true }, "isstream": { "version": "0.1.2", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "jodid25519": { "version": "1.0.2", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz", - "integrity": "sha1-BtSRIlUJNBlHfUJWM2BuDpB4KWc=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -4308,46 +2966,19 @@ }, "jsbn": { "version": "0.1.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "json-schema": { "version": "0.2.3", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "json-stable-stringify": { "version": "1.0.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", - "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -4356,46 +2987,19 @@ }, "json-stringify-safe": { "version": "5.0.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "jsonify": { "version": "0.0.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", - "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "jsprim": { "version": "1.4.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz", - "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -4407,16 +3011,7 @@ "dependencies": { "assert-plus": { "version": "1.0.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true } @@ -4424,30 +3019,12 @@ }, "mime-db": { "version": "1.27.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz", - "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true }, "mime-types": { "version": "2.1.15", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz", - "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "requires": { "mime-db": "1.27.0" @@ -4455,16 +3032,7 @@ }, "minimatch": { "version": "3.0.4", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "requires": { "brace-expansion": "1.1.7" @@ -4472,30 +3040,12 @@ }, "minimist": { "version": "0.0.8", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true }, "mkdirp": { "version": "0.5.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "requires": { "minimist": "0.0.8" @@ -4503,31 +3053,13 @@ }, "ms": { "version": "2.0.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "node-pre-gyp": { "version": "0.6.36", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz", - "integrity": "sha1-22BBEst04NR3VU6bUFsXq936t4Y=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -4544,16 +3076,7 @@ }, "nopt": { "version": "4.0.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", - "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -4563,16 +3086,7 @@ }, "npmlog": { "version": "4.1.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz", - "integrity": "sha512-ocolIkZYZt8UveuiDS0yAkkIjid1o7lPG8cYm05yNYzBn8ykQtaiPMEGp8fY9tKdDgm8okpdKzkvu1y9hUYugA==", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -4584,60 +3098,24 @@ }, "number-is-nan": { "version": "1.0.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true }, "oauth-sign": { "version": "0.8.2", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", - "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "object-assign": { "version": "4.1.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "once": { "version": "1.4.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "requires": { "wrappy": "1.0.2" @@ -4645,46 +3123,19 @@ }, "os-homedir": { "version": "1.0.2", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "os-tmpdir": { "version": "1.0.2", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "osenv": { "version": "0.1.4", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz", - "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -4694,89 +3145,35 @@ }, "path-is-absolute": { "version": "1.0.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true }, "performance-now": { "version": "0.2.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", - "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "process-nextick-args": { "version": "1.0.7", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true }, "punycode": { "version": "1.4.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "qs": { "version": "6.4.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", - "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "rc": { "version": "1.2.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz", - "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -4788,16 +3185,7 @@ "dependencies": { "minimist": { "version": "1.2.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true } @@ -4805,16 +3193,7 @@ }, "readable-stream": { "version": "2.2.9", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz", - "integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "requires": { "buffer-shims": "1.0.0", @@ -4828,16 +3207,7 @@ }, "request": { "version": "2.81.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", - "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -4867,16 +3237,7 @@ }, "rimraf": { "version": "2.6.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz", - "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "requires": { "glob": "7.1.2" @@ -4884,75 +3245,30 @@ }, "safe-buffer": { "version": "5.0.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz", - "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true }, "semver": { "version": "5.3.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", - "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "set-blocking": { "version": "2.0.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "signal-exit": { "version": "3.0.2", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "sntp": { "version": "1.0.9", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", - "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -4961,16 +3277,7 @@ }, "sshpk": { "version": "1.13.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz", - "integrity": "sha1-/yo+T9BEl1Vf7Zezmg/YL6+zozw=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -4987,16 +3294,7 @@ "dependencies": { "assert-plus": { "version": "1.0.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true } @@ -5004,16 +3302,7 @@ }, "string_decoder": { "version": "1.0.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz", - "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "requires": { "safe-buffer": "5.0.1" @@ -5021,16 +3310,7 @@ }, "string-width": { "version": "1.0.2", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "requires": { "code-point-at": "1.1.0", @@ -5040,31 +3320,13 @@ }, "stringstream": { "version": "0.0.5", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", - "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "strip-ansi": { "version": "3.0.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "requires": { "ansi-regex": "2.1.1" @@ -5072,31 +3334,13 @@ }, "strip-json-comments": { "version": "2.0.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "tar": { "version": "2.2.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", - "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "requires": { "block-stream": "0.0.9", @@ -5106,16 +3350,7 @@ }, "tar-pack": { "version": "3.4.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz", - "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -5131,16 +3366,7 @@ }, "tough-cookie": { "version": "2.3.2", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz", - "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -5149,16 +3375,7 @@ }, "tunnel-agent": { "version": "0.6.0", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -5167,75 +3384,30 @@ }, "tweetnacl": { "version": "0.14.5", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "uid-number": { "version": "0.0.6", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz", - "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "util-deprecate": { "version": "1.0.2", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true }, "uuid": { "version": "3.0.1", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz", - "integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE=", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true }, "verror": { "version": "1.3.6", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz", - "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -5244,16 +3416,7 @@ }, "wide-align": { "version": "1.1.2", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", - "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "optional": true, "requires": { @@ -5262,16 +3425,7 @@ }, "wrappy": { "version": "1.0.2", -<<<<<<< HEAD -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", -======= "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "bundled": true, ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true } } @@ -5288,23 +3442,10 @@ "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "get-stdin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", - "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", -======= -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "get-stream": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", -<<<<<<< HEAD ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true }, "glob": { @@ -5372,18 +3513,6 @@ "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "handle-thing": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz", - "integrity": "sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "has-ansi": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", @@ -5468,36 +3597,6 @@ "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "hpack.js": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", - "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=", - "dev": true, - "requires": { - "inherits": "2.0.3", - "obuf": "1.1.1", - "readable-stream": "2.3.3", - "wbuf": "1.7.2" - } - }, - "html-entities": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz", - "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=", - "dev": true - }, - "http-deceiver": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", - "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "http-errors": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz", @@ -5508,11 +3607,6 @@ "inherits": "2.0.3", "setprototypeof": "1.0.3", "statuses": "1.3.1" -<<<<<<< HEAD -<<<<<<< HEAD -======= -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 }, "dependencies": { "depd": { @@ -5521,10 +3615,6 @@ "integrity": "sha1-4b2Cxqq2ztlluXuIsX7T5SjKGMM=", "dev": true } -<<<<<<< HEAD ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 } }, "http-proxy": { @@ -5537,41 +3627,6 @@ "requires-port": "1.0.0" } }, -<<<<<<< HEAD -<<<<<<< HEAD - "http-proxy-middleware": { - "version": "0.17.4", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz", - "integrity": "sha1-ZC6ISIUdZvCdTxJJEoRtuutBuDM=", - "dev": true, - "requires": { - "http-proxy": "1.16.2", - "is-glob": "3.1.0", - "lodash": "4.17.4", - "micromatch": "2.3.11" - }, - "dependencies": { - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true - }, - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, - "requires": { - "is-extglob": "2.1.1" - } - } - } - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "https-browserify": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz", @@ -5602,21 +3657,6 @@ "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "indent-string": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", - "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", - "dev": true, - "requires": { - "repeating": "2.0.1" - } - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "indexof": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", @@ -5707,21 +3747,6 @@ } } }, -<<<<<<< HEAD -<<<<<<< HEAD - "internal-ip": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-1.2.0.tgz", - "integrity": "sha1-rp+/k7mEh4eF1QqN4bNWlWBYz1w=", - "dev": true, - "requires": { - "meow": "3.7.0" - } - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "interpret": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz", @@ -5743,24 +3768,6 @@ "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "ip": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", - "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=", - "dev": true - }, - "ipaddr.js": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz", - "integrity": "sha1-KWrKh4qCGBbluF0KKFqZvP9FgvA=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", @@ -5902,23 +3909,10 @@ "tryit": "1.0.3" } }, -<<<<<<< HEAD -<<<<<<< HEAD - "is-utf8": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", -======= -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", -<<<<<<< HEAD ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true }, "isarray": { @@ -5979,21 +3973,9 @@ "dev": true }, "js-yaml": { -<<<<<<< HEAD -<<<<<<< HEAD - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.0.tgz", - "integrity": "sha512-0LoUNELX4S+iofCT8f4uEHIiRBR+c2AINyC8qRWfC6QNruLtxVZRJaPcu/xwMgFIgDxF25tGHaDjvxzJCNE9yw==", -======= - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.1.tgz", - "integrity": "sha512-CbcG379L1e+mWBnLvHWWeLs8GyV/EMw862uLI3c+GxVyDHWZcjZinwuBd3iW2pgxgIlksW/1vNJa4to+RvDOww==", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "version": "3.9.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.1.tgz", "integrity": "sha512-CbcG379L1e+mWBnLvHWWeLs8GyV/EMw862uLI3c+GxVyDHWZcjZinwuBd3iW2pgxgIlksW/1vNJa4to+RvDOww==", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "requires": { "argparse": "1.0.9", @@ -6162,36 +4144,15 @@ } }, "load-json-file": { -<<<<<<< HEAD -<<<<<<< HEAD - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", -======= - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", - "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "version": "2.0.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "requires": { "graceful-fs": "4.1.11", "parse-json": "2.2.0", "pify": "2.3.0", -<<<<<<< HEAD -<<<<<<< HEAD - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" -======= "strip-bom": "3.0.0" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "strip-bom": "3.0.0" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 } }, "loader-runner": { @@ -6269,18 +4230,6 @@ } } }, -<<<<<<< HEAD -<<<<<<< HEAD - "loglevel": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.4.1.tgz", - "integrity": "sha1-lbOD+Ro8J1b9SrCTZn5DCRYfK80=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "longest": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", @@ -6296,22 +4245,6 @@ "js-tokens": "3.0.2" } }, -<<<<<<< HEAD -<<<<<<< HEAD - "loud-rejection": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", - "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", - "dev": true, - "requires": { - "currently-unhandled": "0.4.1", - "signal-exit": "3.0.2" - } - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "lru-cache": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", @@ -6331,29 +4264,12 @@ "pify": "2.3.0" } }, -<<<<<<< HEAD -<<<<<<< HEAD - "map-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD -======= -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "mem": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", @@ -6363,10 +4279,6 @@ "mimic-fn": "1.1.0" } }, -<<<<<<< HEAD ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "memory-fs": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", @@ -6377,50 +4289,6 @@ "readable-stream": "2.3.3" } }, -<<<<<<< HEAD -<<<<<<< HEAD - "meow": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", - "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", - "dev": true, - "requires": { - "camelcase-keys": "2.1.0", - "decamelize": "1.2.0", - "loud-rejection": "1.6.0", - "map-obj": "1.0.1", - "minimist": "1.2.0", - "normalize-package-data": "2.4.0", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "redent": "1.0.0", - "trim-newlines": "1.0.0" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } - } - }, - "merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", - "dev": true - }, - "methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "micromatch": { "version": "2.3.11", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", @@ -6600,28 +4468,6 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "multicast-dns": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.1.1.tgz", - "integrity": "sha1-bn3oalcIcqsXBYrepxYLvsqBTd4=", - "dev": true, - "requires": { - "dns-packet": "1.1.1", - "thunky": "0.1.0" - } - }, - "multicast-dns-service-types": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz", - "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "mute-stream": { "version": "0.0.7", "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", @@ -6647,18 +4493,6 @@ "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "node-forge": { - "version": "0.6.33", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.6.33.tgz", - "integrity": "sha1-RjgRh59XPUUVWtap9D3ClujoXrw=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "node-libs-browser": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz", @@ -6719,11 +4553,6 @@ "remove-trailing-separator": "1.0.2" } }, -<<<<<<< HEAD -<<<<<<< HEAD -======= -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", @@ -6733,10 +4562,6 @@ "path-key": "2.0.1" } }, -<<<<<<< HEAD ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "null-check": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz", @@ -6771,18 +4596,6 @@ "is-extendable": "0.1.1" } }, -<<<<<<< HEAD -<<<<<<< HEAD - "obuf": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.1.tgz", - "integrity": "sha1-EEEktsYCxnlogaBCVB0220OlJk4=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", @@ -6792,18 +4605,6 @@ "ee-first": "1.1.1" } }, -<<<<<<< HEAD -<<<<<<< HEAD - "on-headers": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz", - "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -6822,22 +4623,6 @@ "mimic-fn": "1.1.0" } }, -<<<<<<< HEAD -<<<<<<< HEAD - "opn": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz", - "integrity": "sha1-erwi5kTf9jsKltWrfyeQwPAavJU=", - "dev": true, - "requires": { - "object-assign": "4.1.1", - "pinkie-promise": "2.0.1" - } - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "optimist": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", @@ -6876,33 +4661,6 @@ "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "original": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/original/-/original-1.0.0.tgz", - "integrity": "sha1-kUf5P6FpbQS+YeAb1QuurKZWvTs=", - "dev": true, - "requires": { - "url-parse": "1.0.5" - }, - "dependencies": { - "url-parse": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.0.5.tgz", - "integrity": "sha1-CFSGBCKv3P7+tsllxmLUgAFpkns=", - "dev": true, - "requires": { - "querystringify": "0.0.4", - "requires-port": "1.0.0" - } - } - } - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "os-browserify": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz", @@ -6916,17 +4674,6 @@ "dev": true }, "os-locale": { -<<<<<<< HEAD -<<<<<<< HEAD - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", - "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", - "dev": true, - "requires": { - "lcid": "1.0.0" -======= -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "version": "2.1.0", "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", @@ -6935,10 +4682,6 @@ "execa": "0.7.0", "lcid": "1.0.0", "mem": "1.1.0" -<<<<<<< HEAD ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 } }, "os-tmpdir": { @@ -6947,21 +4690,12 @@ "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD -======= -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "p-finally": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", "dev": true }, -<<<<<<< HEAD ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "p-limit": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz", @@ -6977,18 +4711,6 @@ "p-limit": "1.1.0" } }, -<<<<<<< HEAD -<<<<<<< HEAD - "p-map": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.1.1.tgz", - "integrity": "sha1-BfXkrpegaDcbwqXMhr+9vBnErno=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "pako": { "version": "0.2.9", "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz", @@ -7086,26 +4808,6 @@ "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=", - "dev": true - }, - "path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" -======= -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "path-key": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", @@ -7119,10 +4821,6 @@ "dev": true, "requires": { "pify": "2.3.0" -<<<<<<< HEAD ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 } }, "pbkdf2": { @@ -7174,31 +4872,6 @@ "integrity": "sha1-WbcIwcAZCi9pLxx2GMRGsFL9F2I=", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "portfinder": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.13.tgz", - "integrity": "sha1-uzLs2HwnEErm7kS1o8y/Drsa7ek=", - "dev": true, - "requires": { - "async": "1.5.2", - "debug": "2.6.8", - "mkdirp": "0.5.1" - }, - "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true - } - } - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "prelude-ls": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", @@ -7235,22 +4908,6 @@ "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "proxy-addr": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz", - "integrity": "sha1-ccDuOxAt4/IC87ZPYI0XP8uhqRg=", - "dev": true, - "requires": { - "forwarded": "0.1.0", - "ipaddr.js": "1.4.0" - } - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "prr": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz", @@ -7306,18 +4963,6 @@ "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "querystringify": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-0.0.4.tgz", - "integrity": "sha1-DPf4T5Rj/wrlHExLFC2VvjdyTZw=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "randomatic": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", @@ -7394,50 +5039,6 @@ } }, "read-pkg": { -<<<<<<< HEAD -<<<<<<< HEAD - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", - "dev": true, - "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" - } - }, - "read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", - "dev": true, - "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" - }, - "dependencies": { - "find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", - "dev": true, - "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" - } - }, - "path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", - "dev": true, - "requires": { - "pinkie-promise": "2.0.1" - } - } -======= -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "version": "2.0.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", @@ -7456,10 +5057,6 @@ "requires": { "find-up": "2.1.0", "read-pkg": "2.0.0" -<<<<<<< HEAD ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 } }, "readable-stream": { @@ -7489,22 +5086,6 @@ "set-immediate-shim": "1.0.1" } }, -<<<<<<< HEAD -<<<<<<< HEAD - "redent": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", - "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", - "dev": true, - "requires": { - "indent-string": "2.1.0", - "strip-indent": "1.0.1" - } - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "regenerate": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz", @@ -7523,15 +5104,7 @@ "integrity": "sha1-On0GdSDLe3F2dp61/4aGkb7+EoM=", "dev": true, "requires": { -<<<<<<< HEAD -<<<<<<< HEAD - "babel-runtime": "6.23.0", -======= "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "babel-runtime": "6.25.0", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "babel-types": "6.25.0", "private": "0.1.7" } @@ -7714,104 +5287,12 @@ "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "select-hose": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", - "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=", - "dev": true - }, - "selfsigned": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.9.1.tgz", - "integrity": "sha1-zdpEktcNSGVw+HxlVGAjVY4d+lo=", - "dev": true, - "requires": { - "node-forge": "0.6.33" - } - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "semver": { "version": "5.4.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "send": { - "version": "0.15.3", - "resolved": "https://registry.npmjs.org/send/-/send-0.15.3.tgz", - "integrity": "sha1-UBP5+ZAj31DRvZiSwZ4979HVMwk=", - "dev": true, - "requires": { - "debug": "2.6.7", - "depd": "1.1.0", - "destroy": "1.0.4", - "encodeurl": "1.0.1", - "escape-html": "1.0.3", - "etag": "1.8.0", - "fresh": "0.5.0", - "http-errors": "1.6.1", - "mime": "1.3.4", - "ms": "2.0.0", - "on-finished": "2.3.0", - "range-parser": "1.2.0", - "statuses": "1.3.1" - }, - "dependencies": { - "debug": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz", - "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4=", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "mime": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz", - "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM=", - "dev": true - } - } - }, - "serve-index": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.0.tgz", - "integrity": "sha1-0rKA/FYNYW7oG0i/D6gqvtJIXOc=", - "dev": true, - "requires": { - "accepts": "1.3.3", - "batch": "0.6.1", - "debug": "2.6.8", - "escape-html": "1.0.3", - "http-errors": "1.6.1", - "mime-types": "2.1.16", - "parseurl": "1.3.1" - } - }, - "serve-static": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.12.3.tgz", - "integrity": "sha1-n0uhni8wMMVH+K+ZEHg47DjVseI=", - "dev": true, - "requires": { - "encodeurl": "1.0.1", - "escape-html": "1.0.3", - "parseurl": "1.3.1", - "send": "0.15.3" - } - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8026,47 +5507,6 @@ } } }, -<<<<<<< HEAD -<<<<<<< HEAD - "sockjs": { - "version": "0.3.18", - "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.18.tgz", - "integrity": "sha1-2bKJMWyn33dZXvKZ4HXw+TfrQgc=", - "dev": true, - "requires": { - "faye-websocket": "0.10.0", - "uuid": "2.0.3" - } - }, - "sockjs-client": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.4.tgz", - "integrity": "sha1-W6vjhrd15M8U51IJEUUmVAFsixI=", - "dev": true, - "requires": { - "debug": "2.6.8", - "eventsource": "0.1.6", - "faye-websocket": "0.11.1", - "inherits": "2.0.3", - "json3": "3.3.2", - "url-parse": "1.1.9" - }, - "dependencies": { - "faye-websocket": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz", - "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=", - "dev": true, - "requires": { - "websocket-driver": "0.6.5" - } - } - } - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "source-list-map": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz", @@ -8109,41 +5549,6 @@ "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "spdy": { - "version": "3.4.7", - "resolved": "https://registry.npmjs.org/spdy/-/spdy-3.4.7.tgz", - "integrity": "sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=", - "dev": true, - "requires": { - "debug": "2.6.8", - "handle-thing": "1.2.5", - "http-deceiver": "1.2.7", - "safe-buffer": "5.1.1", - "select-hose": "2.0.0", - "spdy-transport": "2.0.20" - } - }, - "spdy-transport": { - "version": "2.0.20", - "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-2.0.20.tgz", - "integrity": "sha1-c15yBUxIayNU/onnAiVgBKOazk0=", - "dev": true, - "requires": { - "debug": "2.6.8", - "detect-node": "2.0.3", - "hpack.js": "2.1.6", - "obuf": "1.1.1", - "readable-stream": "2.3.3", - "safe-buffer": "5.1.1", - "wbuf": "1.7.2" - } - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", @@ -8225,27 +5630,6 @@ } }, "strip-bom": { -<<<<<<< HEAD -<<<<<<< HEAD - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "dev": true, - "requires": { - "is-utf8": "0.2.1" - } - }, - "strip-indent": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", - "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", - "dev": true, - "requires": { - "get-stdin": "4.0.1" - } -======= -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", @@ -8256,10 +5640,6 @@ "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", "dev": true -<<<<<<< HEAD ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 }, "strip-json-comments": { "version": "2.0.1", @@ -8317,18 +5697,6 @@ "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "thunky": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz", - "integrity": "sha1-vzAUaCTituZ7Dy16Ssi+smkIaE4=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "timers-browserify": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz", @@ -8371,18 +5739,6 @@ "integrity": "sha1-TcGeZk38y+Jb2NtQiwDG2hWCVdE=", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "trim-newlines": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", - "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "trim-right": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", @@ -8505,30 +5861,6 @@ } } }, -<<<<<<< HEAD -<<<<<<< HEAD - "url-parse": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.1.9.tgz", - "integrity": "sha1-xn8dd11R8KGJEd17P/rSe7nlvRk=", - "dev": true, - "requires": { - "querystringify": "1.0.0", - "requires-port": "1.0.0" - }, - "dependencies": { - "querystringify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-1.0.0.tgz", - "integrity": "sha1-YoYkIRLFtxL6ZU5SZlK/ahP/Bcs=", - "dev": true - } - } - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "useragent": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz", @@ -8576,18 +5908,6 @@ "integrity": "sha1-ApT7kiu5N1FTVBxPcJYjHyh8ivg=", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "uuid": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", - "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "validate-npm-package-license": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", @@ -8598,18 +5918,6 @@ "spdx-expression-parse": "1.0.4" } }, -<<<<<<< HEAD -<<<<<<< HEAD - "vary": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz", - "integrity": "sha1-Z1Neu2lMHVIldFeYRmUyP1h+jTc=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "vm-browserify": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", @@ -8636,32 +5944,10 @@ "graceful-fs": "4.1.11" } }, -<<<<<<< HEAD -<<<<<<< HEAD - "wbuf": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.2.tgz", - "integrity": "sha1-1pe5nx9ZUS3ydRvkJ2nBWAtYAf4=", - "dev": true, - "requires": { - "minimalistic-assert": "1.0.0" - } - }, - "webpack": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.3.0.tgz", - "integrity": "sha1-zi+eB2Vmq6kfdIhxM6iD/X2hh7w=", -======= -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "webpack": { "version": "3.4.1", "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.4.1.tgz", "integrity": "sha1-TD9PP7MYFVpNsMtqNv8FxWl0GPQ=", -<<<<<<< HEAD ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true, "requires": { "acorn": "5.1.1", @@ -8680,28 +5966,12 @@ "mkdirp": "0.5.1", "node-libs-browser": "2.0.0", "source-map": "0.5.6", -<<<<<<< HEAD -<<<<<<< HEAD - "supports-color": "3.2.3", -======= "supports-color": "4.2.1", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= - "supports-color": "4.2.1", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "tapable": "0.2.7", "uglifyjs-webpack-plugin": "0.4.6", "watchpack": "1.4.0", "webpack-sources": "1.0.1", -<<<<<<< HEAD -<<<<<<< HEAD - "yargs": "6.6.0" -======= - "yargs": "8.0.2" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "yargs": "8.0.2" ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 }, "dependencies": { "ajv-keywords": { @@ -8710,124 +5980,6 @@ "integrity": "sha1-opbhf3v658HOT34N5T0pyzIWLfA=", "dev": true }, -<<<<<<< HEAD -<<<<<<< HEAD - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "webpack-dev-middleware": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.11.0.tgz", - "integrity": "sha1-CWkdCXOjCtH4Ksc6EuIIfwpHVPk=", - "dev": true, - "requires": { - "memory-fs": "0.4.1", - "mime": "1.3.6", - "path-is-absolute": "1.0.1", - "range-parser": "1.2.0" - } - }, - "webpack-dev-server": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-2.6.1.tgz", - "integrity": "sha1-Cykqnaltr4CmWYj2n4e0Fm5d7+c=", - "dev": true, - "requires": { - "ansi-html": "0.0.7", - "bonjour": "3.5.0", - "chokidar": "1.7.0", - "compression": "1.7.0", - "connect-history-api-fallback": "1.3.0", - "del": "3.0.0", - "express": "4.15.3", - "html-entities": "1.2.1", - "http-proxy-middleware": "0.17.4", - "internal-ip": "1.2.0", - "loglevel": "1.4.1", - "opn": "4.0.2", - "portfinder": "1.0.13", - "selfsigned": "1.9.1", - "serve-index": "1.9.0", - "sockjs": "0.3.18", - "sockjs-client": "1.1.4", - "spdy": "3.4.7", - "strip-ansi": "3.0.1", - "supports-color": "3.2.3", - "webpack-dev-middleware": "1.11.0", - "yargs": "6.6.0" - }, - "dependencies": { - "del": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz", - "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=", - "dev": true, - "requires": { - "globby": "6.1.0", - "is-path-cwd": "1.0.0", - "is-path-in-cwd": "1.0.0", - "p-map": "1.1.1", - "pify": "3.0.0", - "rimraf": "2.6.1" - } - }, - "globby": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", - "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", - "dev": true, - "requires": { - "array-union": "1.0.2", - "glob": "7.1.2", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" -======= -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "supports-color": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz", @@ -8835,10 +5987,6 @@ "dev": true, "requires": { "has-flag": "2.0.0" -<<<<<<< HEAD ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 } } } @@ -8853,27 +6001,6 @@ "source-map": "0.5.6" } }, -<<<<<<< HEAD -<<<<<<< HEAD - "websocket-driver": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz", - "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=", - "dev": true, - "requires": { - "websocket-extensions": "0.1.1" - } - }, - "websocket-extensions": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz", - "integrity": "sha1-domUmcGEtu91Q3fC27DNbLVdKec=", - "dev": true - }, -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "which": { "version": "1.2.14", "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz", @@ -8884,21 +6011,9 @@ } }, "which-module": { -<<<<<<< HEAD -<<<<<<< HEAD - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", - "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", -======= - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= "version": "2.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true }, "window-size": { @@ -9006,35 +6121,6 @@ "dev": true }, "yargs": { -<<<<<<< HEAD -<<<<<<< HEAD - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", - "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=", - "dev": true, - "requires": { - "camelcase": "3.0.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.2", - "os-locale": "1.4.0", - "read-pkg-up": "1.0.1", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "1.0.2", - "which-module": "1.0.0", - "y18n": "3.2.1", - "yargs-parser": "4.2.1" - }, - "dependencies": { - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", -======= -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "version": "8.0.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz", "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=", @@ -9059,10 +6145,6 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", -<<<<<<< HEAD ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true }, "cliui": { @@ -9074,11 +6156,6 @@ "string-width": "1.0.2", "strip-ansi": "3.0.1", "wrap-ansi": "2.1.0" -<<<<<<< HEAD -<<<<<<< HEAD -======= -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 }, "dependencies": { "string-width": { @@ -9092,10 +6169,6 @@ "strip-ansi": "3.0.1" } } -<<<<<<< HEAD ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 } }, "is-fullwidth-code-point": { @@ -9106,44 +6179,10 @@ "requires": { "number-is-nan": "1.0.1" } -<<<<<<< HEAD -<<<<<<< HEAD - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 } } }, "yargs-parser": { -<<<<<<< HEAD -<<<<<<< HEAD - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz", - "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=", - "dev": true, - "requires": { - "camelcase": "3.0.0" - }, - "dependencies": { - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", -======= -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "version": "7.0.0", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz", "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", @@ -9156,10 +6195,6 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", -<<<<<<< HEAD ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 -======= ->>>>>>> 3781e14a90b75ce590c8b15c1ecf51327ec031c6 "dev": true } } @@ -9171,4 +6206,4 @@ "dev": true } } -} +} \ No newline at end of file diff --git a/package.json b/package.json index bf0d5ebd..e74891c4 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/eweitz/ideogram.git" + "url": "git+https://github.com/eweitz/ideogram.git" }, "keywords": [ "chromosome",