diff --git a/index.html b/index.html
index 69b0b135a6408fe21478a391bd7439044525e87c..dfddbf26dfda4718ccccae32f8f4c0947c690379 100644
--- a/index.html
+++ b/index.html
@@ -4,6 +4,7 @@
当当网
+ baqiyidian
diff --git a/package-lock.json b/package-lock.json
index 4c1765af00dd1dc802a1fc108b8e29730b255583..83b04fd333bc205c0eff1a1c0162eebe11b75586 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,10 +20,17 @@
"dev": true,
"requires": {
"@babel/types": "7.0.0-beta.44",
+<<<<<<< HEAD
"jsesc": "2.5.2",
"lodash": "4.17.11",
"source-map": "0.5.7",
"trim-right": "1.0.1"
+=======
+ "jsesc": "^2.5.1",
+ "lodash": "^4.2.0",
+ "source-map": "^0.5.0",
+ "trim-right": "^1.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"jsesc": {
@@ -75,9 +82,15 @@
"integrity": "sha512-Il19yJvy7vMFm8AVAh6OZzaFoAd0hbkeMZiX3P5HGD+z7dyI7RzndHB0dg6Urh/VAFfHtpOIzDUSxmY6coyZWQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "2.4.1",
"esutils": "2.0.2",
"js-tokens": "3.0.2"
+=======
+ "chalk": "^2.0.0",
+ "esutils": "^2.0.2",
+ "js-tokens": "^3.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"@babel/template": {
@@ -89,7 +102,11 @@
"@babel/code-frame": "7.0.0-beta.44",
"@babel/types": "7.0.0-beta.44",
"babylon": "7.0.0-beta.44",
+<<<<<<< HEAD
"lodash": "4.17.11"
+=======
+ "lodash": "^4.2.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"babylon": {
@@ -112,10 +129,17 @@
"@babel/helper-split-export-declaration": "7.0.0-beta.44",
"@babel/types": "7.0.0-beta.44",
"babylon": "7.0.0-beta.44",
+<<<<<<< HEAD
"debug": "3.2.6",
"globals": "11.9.0",
"invariant": "2.2.4",
"lodash": "4.17.11"
+=======
+ "debug": "^3.1.0",
+ "globals": "^11.1.0",
+ "invariant": "^2.2.0",
+ "lodash": "^4.2.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"babylon": {
@@ -130,7 +154,11 @@
"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ms": "2.1.1"
+=======
+ "ms": "^2.1.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"globals": {
@@ -153,9 +181,15 @@
"integrity": "sha512-5eTV4WRmqbaFM3v9gHAIljEQJU4Ssc6fxL61JN+Oe2ga/BwyjzjamwkCVVAQjHGuAX8i0BWo42dshL8eO5KfLQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"esutils": "2.0.2",
"lodash": "4.17.11",
"to-fast-properties": "2.0.0"
+=======
+ "esutils": "^2.0.2",
+ "lodash": "^4.2.0",
+ "to-fast-properties": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"to-fast-properties": {
@@ -166,13 +200,26 @@
}
}
},
+<<<<<<< HEAD
+=======
+ "abbrev": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+ "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+ "dev": true
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"accepts": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
"integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"mime-types": "2.1.21",
+=======
+ "mime-types": "~2.1.18",
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"negotiator": "0.6.1"
}
},
@@ -188,7 +235,11 @@
"integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"acorn": "4.0.13"
+=======
+ "acorn": "^4.0.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"acorn": {
@@ -205,7 +256,11 @@
"integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"acorn": "3.3.0"
+=======
+ "acorn": "^3.0.4"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"acorn": {
@@ -222,10 +277,17 @@
"integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"co": "4.6.0",
"fast-deep-equal": "1.1.0",
"fast-json-stable-stringify": "2.0.0",
"json-schema-traverse": "0.3.1"
+=======
+ "co": "^4.6.0",
+ "fast-deep-equal": "^1.0.0",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.3.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"ajv-keywords": {
@@ -240,9 +302,15 @@
"integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"kind-of": "3.2.2",
"longest": "1.0.1",
"repeat-string": "1.6.1"
+=======
+ "kind-of": "^3.0.2",
+ "longest": "^1.0.1",
+ "repeat-string": "^1.5.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"alphanum-sort": {
@@ -251,6 +319,15 @@
"integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "amdefine": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+ "dev": true
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"ansi-escapes": {
"version": "3.1.0",
"resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
@@ -275,7 +352,11 @@
"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"color-convert": "1.9.3"
+=======
+ "color-convert": "^1.9.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"anymatch": {
@@ -284,8 +365,13 @@
"integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"micromatch": "3.1.10",
"normalize-path": "2.1.1"
+=======
+ "micromatch": "^3.1.4",
+ "normalize-path": "^2.1.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"aproba": {
@@ -294,13 +380,30 @@
"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "are-we-there-yet": {
+ "version": "1.1.5",
+ "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
+ "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+ "dev": true,
+ "requires": {
+ "delegates": "^1.0.0",
+ "readable-stream": "^2.0.6"
+ }
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"argparse": {
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"sprintf-js": "1.0.3"
+=======
+ "sprintf-js": "~1.0.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"arr-diff": {
@@ -324,8 +427,12 @@
"array-find-index": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+<<<<<<< HEAD
"integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
"dev": true
+=======
+ "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E="
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"array-flatten": {
"version": "1.1.1",
@@ -339,8 +446,13 @@
"integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"define-properties": "1.1.3",
"es-abstract": "1.12.0"
+=======
+ "define-properties": "^1.1.2",
+ "es-abstract": "^1.7.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"array-union": {
@@ -349,7 +461,11 @@
"integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"array-uniq": "1.0.3"
+=======
+ "array-uniq": "^1.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"array-uniq": {
@@ -370,15 +486,33 @@
"integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "asn1": {
+ "version": "0.2.4",
+ "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+ "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+ "dev": true,
+ "requires": {
+ "safer-buffer": "~2.1.0"
+ }
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"asn1.js": {
"version": "4.10.1",
"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
"integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"bn.js": "4.11.8",
"inherits": "2.0.3",
"minimalistic-assert": "1.0.1"
+=======
+ "bn.js": "^4.0.0",
+ "inherits": "^2.0.1",
+ "minimalistic-assert": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"assert": {
@@ -407,6 +541,15 @@
}
}
},
+<<<<<<< HEAD
+=======
+ "assert-plus": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+ "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+ "dev": true
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"assign-symbols": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
@@ -419,7 +562,11 @@
"integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"lodash": "4.17.11"
+=======
+ "lodash": "^4.17.10"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"async-each": {
@@ -428,12 +575,30 @@
"integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "async-foreach": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
+ "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
+ "dev": true
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"async-limiter": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
"integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "asynckit": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+ "dev": true
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"atob": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
@@ -446,6 +611,7 @@
"integrity": "sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"browserslist": "2.11.3",
"caniuse-lite": "1.0.30000921",
"normalize-range": "0.1.2",
@@ -454,15 +620,43 @@
"postcss-value-parser": "3.3.1"
}
},
+=======
+ "browserslist": "^2.11.3",
+ "caniuse-lite": "^1.0.30000805",
+ "normalize-range": "^0.1.2",
+ "num2fraction": "^1.2.2",
+ "postcss": "^6.0.17",
+ "postcss-value-parser": "^3.2.3"
+ }
+ },
+ "aws-sign2": {
+ "version": "0.7.0",
+ "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+ "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+ "dev": true
+ },
+ "aws4": {
+ "version": "1.8.0",
+ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
+ "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
+ "dev": true
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"babel-code-frame": {
"version": "6.26.0",
"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
"integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"esutils": "2.0.2",
"js-tokens": "3.0.2"
+=======
+ "chalk": "^1.1.3",
+ "esutils": "^2.0.2",
+ "js-tokens": "^3.0.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -477,11 +671,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"supports-color": {
@@ -498,6 +700,7 @@
"integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-code-frame": "6.26.0",
"babel-generator": "6.26.1",
"babel-helpers": "6.24.1",
@@ -517,6 +720,27 @@
"private": "0.1.8",
"slash": "1.0.0",
"source-map": "0.5.7"
+=======
+ "babel-code-frame": "^6.26.0",
+ "babel-generator": "^6.26.0",
+ "babel-helpers": "^6.24.1",
+ "babel-messages": "^6.23.0",
+ "babel-register": "^6.26.0",
+ "babel-runtime": "^6.26.0",
+ "babel-template": "^6.26.0",
+ "babel-traverse": "^6.26.0",
+ "babel-types": "^6.26.0",
+ "babylon": "^6.18.0",
+ "convert-source-map": "^1.5.1",
+ "debug": "^2.6.9",
+ "json5": "^0.5.1",
+ "lodash": "^4.17.4",
+ "minimatch": "^3.0.4",
+ "path-is-absolute": "^1.0.1",
+ "private": "^0.1.8",
+ "slash": "^1.0.0",
+ "source-map": "^0.5.7"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"source-map": {
@@ -538,7 +762,11 @@
"@babel/types": "7.0.0-beta.44",
"babylon": "7.0.0-beta.44",
"eslint-scope": "3.7.1",
+<<<<<<< HEAD
"eslint-visitor-keys": "1.0.0"
+=======
+ "eslint-visitor-keys": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"babylon": {
@@ -555,6 +783,7 @@
"integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-messages": "6.23.0",
"babel-runtime": "6.26.0",
"babel-types": "6.26.0",
@@ -563,6 +792,16 @@
"lodash": "4.17.11",
"source-map": "0.5.7",
"trim-right": "1.0.1"
+=======
+ "babel-messages": "^6.23.0",
+ "babel-runtime": "^6.26.0",
+ "babel-types": "^6.26.0",
+ "detect-indent": "^4.0.0",
+ "jsesc": "^1.3.0",
+ "lodash": "^4.17.4",
+ "source-map": "^0.5.7",
+ "trim-right": "^1.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"source-map": {
@@ -579,9 +818,15 @@
"integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-runtime": "6.26.0",
"babel-traverse": "6.26.0",
"babel-types": "6.26.0"
+=======
+ "babel-runtime": "^6.22.0",
+ "babel-traverse": "^6.24.1",
+ "babel-types": "^6.24.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-helper-builder-binary-assignment-operator-visitor": {
@@ -590,9 +835,15 @@
"integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-helper-explode-assignable-expression": "6.24.1",
"babel-runtime": "6.26.0",
"babel-types": "6.26.0"
+=======
+ "babel-helper-explode-assignable-expression": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-types": "^6.24.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-helper-call-delegate": {
@@ -601,10 +852,17 @@
"integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-helper-hoist-variables": "6.24.1",
"babel-runtime": "6.26.0",
"babel-traverse": "6.26.0",
"babel-types": "6.26.0"
+=======
+ "babel-helper-hoist-variables": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-traverse": "^6.24.1",
+ "babel-types": "^6.24.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-helper-define-map": {
@@ -613,10 +871,17 @@
"integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-helper-function-name": "6.24.1",
"babel-runtime": "6.26.0",
"babel-types": "6.26.0",
"lodash": "4.17.11"
+=======
+ "babel-helper-function-name": "^6.24.1",
+ "babel-runtime": "^6.26.0",
+ "babel-types": "^6.26.0",
+ "lodash": "^4.17.4"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-helper-explode-assignable-expression": {
@@ -625,9 +890,15 @@
"integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-runtime": "6.26.0",
"babel-traverse": "6.26.0",
"babel-types": "6.26.0"
+=======
+ "babel-runtime": "^6.22.0",
+ "babel-traverse": "^6.24.1",
+ "babel-types": "^6.24.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-helper-explode-class": {
@@ -636,10 +907,17 @@
"integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-helper-bindify-decorators": "6.24.1",
"babel-runtime": "6.26.0",
"babel-traverse": "6.26.0",
"babel-types": "6.26.0"
+=======
+ "babel-helper-bindify-decorators": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-traverse": "^6.24.1",
+ "babel-types": "^6.24.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-helper-function-name": {
@@ -648,11 +926,19 @@
"integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-helper-get-function-arity": "6.24.1",
"babel-runtime": "6.26.0",
"babel-template": "6.26.0",
"babel-traverse": "6.26.0",
"babel-types": "6.26.0"
+=======
+ "babel-helper-get-function-arity": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1",
+ "babel-traverse": "^6.24.1",
+ "babel-types": "^6.24.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-helper-get-function-arity": {
@@ -661,8 +947,13 @@
"integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-runtime": "6.26.0",
"babel-types": "6.26.0"
+=======
+ "babel-runtime": "^6.22.0",
+ "babel-types": "^6.24.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-helper-hoist-variables": {
@@ -671,8 +962,13 @@
"integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-runtime": "6.26.0",
"babel-types": "6.26.0"
+=======
+ "babel-runtime": "^6.22.0",
+ "babel-types": "^6.24.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-helper-optimise-call-expression": {
@@ -681,8 +977,13 @@
"integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-runtime": "6.26.0",
"babel-types": "6.26.0"
+=======
+ "babel-runtime": "^6.22.0",
+ "babel-types": "^6.24.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-helper-regex": {
@@ -691,9 +992,15 @@
"integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-runtime": "6.26.0",
"babel-types": "6.26.0",
"lodash": "4.17.11"
+=======
+ "babel-runtime": "^6.26.0",
+ "babel-types": "^6.26.0",
+ "lodash": "^4.17.4"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-helper-remap-async-to-generator": {
@@ -702,11 +1009,19 @@
"integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-helper-function-name": "6.24.1",
"babel-runtime": "6.26.0",
"babel-template": "6.26.0",
"babel-traverse": "6.26.0",
"babel-types": "6.26.0"
+=======
+ "babel-helper-function-name": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1",
+ "babel-traverse": "^6.24.1",
+ "babel-types": "^6.24.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-helper-replace-supers": {
@@ -715,12 +1030,21 @@
"integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-helper-optimise-call-expression": "6.24.1",
"babel-messages": "6.23.0",
"babel-runtime": "6.26.0",
"babel-template": "6.26.0",
"babel-traverse": "6.26.0",
"babel-types": "6.26.0"
+=======
+ "babel-helper-optimise-call-expression": "^6.24.1",
+ "babel-messages": "^6.23.0",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1",
+ "babel-traverse": "^6.24.1",
+ "babel-types": "^6.24.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-helper-vue-jsx-merge-props": {
@@ -735,8 +1059,13 @@
"integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-runtime": "6.26.0",
"babel-template": "6.26.0"
+=======
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-loader": {
@@ -745,9 +1074,15 @@
"integrity": "sha512-iCHfbieL5d1LfOQeeVJEUyD9rTwBcP/fcEbRCfempxTDuqrKpu0AZjLAQHEQa3Yqyj9ORKe2iHfoj4rHLf7xpw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"find-cache-dir": "1.0.0",
"loader-utils": "1.1.0",
"mkdirp": "0.5.1"
+=======
+ "find-cache-dir": "^1.0.0",
+ "loader-utils": "^1.0.2",
+ "mkdirp": "^0.5.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-messages": {
@@ -756,7 +1091,11 @@
"integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-runtime": "6.26.0"
+=======
+ "babel-runtime": "^6.22.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-check-es2015-constants": {
@@ -765,7 +1104,11 @@
"integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-runtime": "6.26.0"
+=======
+ "babel-runtime": "^6.22.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-syntax-async-functions": {
@@ -828,9 +1171,15 @@
"integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-helper-remap-async-to-generator": "6.24.1",
"babel-plugin-syntax-async-generators": "6.13.0",
"babel-runtime": "6.26.0"
+=======
+ "babel-helper-remap-async-to-generator": "^6.24.1",
+ "babel-plugin-syntax-async-generators": "^6.5.0",
+ "babel-runtime": "^6.22.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-async-to-generator": {
@@ -839,9 +1188,15 @@
"integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-helper-remap-async-to-generator": "6.24.1",
"babel-plugin-syntax-async-functions": "6.13.0",
"babel-runtime": "6.26.0"
+=======
+ "babel-helper-remap-async-to-generator": "^6.24.1",
+ "babel-plugin-syntax-async-functions": "^6.8.0",
+ "babel-runtime": "^6.22.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-class-properties": {
@@ -850,10 +1205,17 @@
"integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-helper-function-name": "6.24.1",
"babel-plugin-syntax-class-properties": "6.13.0",
"babel-runtime": "6.26.0",
"babel-template": "6.26.0"
+=======
+ "babel-helper-function-name": "^6.24.1",
+ "babel-plugin-syntax-class-properties": "^6.8.0",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-decorators": {
@@ -862,11 +1224,19 @@
"integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-helper-explode-class": "6.24.1",
"babel-plugin-syntax-decorators": "6.13.0",
"babel-runtime": "6.26.0",
"babel-template": "6.26.0",
"babel-types": "6.26.0"
+=======
+ "babel-helper-explode-class": "^6.24.1",
+ "babel-plugin-syntax-decorators": "^6.13.0",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1",
+ "babel-types": "^6.24.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-es2015-arrow-functions": {
@@ -875,7 +1245,11 @@
"integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-runtime": "6.26.0"
+=======
+ "babel-runtime": "^6.22.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-es2015-block-scoped-functions": {
@@ -884,7 +1258,11 @@
"integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-runtime": "6.26.0"
+=======
+ "babel-runtime": "^6.22.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-es2015-block-scoping": {
@@ -893,11 +1271,19 @@
"integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-runtime": "6.26.0",
"babel-template": "6.26.0",
"babel-traverse": "6.26.0",
"babel-types": "6.26.0",
"lodash": "4.17.11"
+=======
+ "babel-runtime": "^6.26.0",
+ "babel-template": "^6.26.0",
+ "babel-traverse": "^6.26.0",
+ "babel-types": "^6.26.0",
+ "lodash": "^4.17.4"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-es2015-classes": {
@@ -906,6 +1292,7 @@
"integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-helper-define-map": "6.26.0",
"babel-helper-function-name": "6.24.1",
"babel-helper-optimise-call-expression": "6.24.1",
@@ -915,6 +1302,17 @@
"babel-template": "6.26.0",
"babel-traverse": "6.26.0",
"babel-types": "6.26.0"
+=======
+ "babel-helper-define-map": "^6.24.1",
+ "babel-helper-function-name": "^6.24.1",
+ "babel-helper-optimise-call-expression": "^6.24.1",
+ "babel-helper-replace-supers": "^6.24.1",
+ "babel-messages": "^6.23.0",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1",
+ "babel-traverse": "^6.24.1",
+ "babel-types": "^6.24.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-es2015-computed-properties": {
@@ -923,8 +1321,13 @@
"integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-runtime": "6.26.0",
"babel-template": "6.26.0"
+=======
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-es2015-destructuring": {
@@ -933,7 +1336,11 @@
"integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-runtime": "6.26.0"
+=======
+ "babel-runtime": "^6.22.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-es2015-duplicate-keys": {
@@ -942,8 +1349,13 @@
"integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-runtime": "6.26.0",
"babel-types": "6.26.0"
+=======
+ "babel-runtime": "^6.22.0",
+ "babel-types": "^6.24.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-es2015-for-of": {
@@ -952,7 +1364,11 @@
"integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-runtime": "6.26.0"
+=======
+ "babel-runtime": "^6.22.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-es2015-function-name": {
@@ -961,9 +1377,15 @@
"integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-helper-function-name": "6.24.1",
"babel-runtime": "6.26.0",
"babel-types": "6.26.0"
+=======
+ "babel-helper-function-name": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-types": "^6.24.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-es2015-literals": {
@@ -972,7 +1394,11 @@
"integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-runtime": "6.26.0"
+=======
+ "babel-runtime": "^6.22.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-es2015-modules-amd": {
@@ -981,9 +1407,15 @@
"integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-plugin-transform-es2015-modules-commonjs": "6.26.2",
"babel-runtime": "6.26.0",
"babel-template": "6.26.0"
+=======
+ "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-es2015-modules-commonjs": {
@@ -992,10 +1424,17 @@
"integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-plugin-transform-strict-mode": "6.24.1",
"babel-runtime": "6.26.0",
"babel-template": "6.26.0",
"babel-types": "6.26.0"
+=======
+ "babel-plugin-transform-strict-mode": "^6.24.1",
+ "babel-runtime": "^6.26.0",
+ "babel-template": "^6.26.0",
+ "babel-types": "^6.26.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-es2015-modules-systemjs": {
@@ -1004,9 +1443,15 @@
"integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-helper-hoist-variables": "6.24.1",
"babel-runtime": "6.26.0",
"babel-template": "6.26.0"
+=======
+ "babel-helper-hoist-variables": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-es2015-modules-umd": {
@@ -1015,9 +1460,15 @@
"integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-plugin-transform-es2015-modules-amd": "6.24.1",
"babel-runtime": "6.26.0",
"babel-template": "6.26.0"
+=======
+ "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-es2015-object-super": {
@@ -1026,8 +1477,13 @@
"integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-helper-replace-supers": "6.24.1",
"babel-runtime": "6.26.0"
+=======
+ "babel-helper-replace-supers": "^6.24.1",
+ "babel-runtime": "^6.22.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-es2015-parameters": {
@@ -1036,12 +1492,21 @@
"integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-helper-call-delegate": "6.24.1",
"babel-helper-get-function-arity": "6.24.1",
"babel-runtime": "6.26.0",
"babel-template": "6.26.0",
"babel-traverse": "6.26.0",
"babel-types": "6.26.0"
+=======
+ "babel-helper-call-delegate": "^6.24.1",
+ "babel-helper-get-function-arity": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1",
+ "babel-traverse": "^6.24.1",
+ "babel-types": "^6.24.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-es2015-shorthand-properties": {
@@ -1050,8 +1515,13 @@
"integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-runtime": "6.26.0",
"babel-types": "6.26.0"
+=======
+ "babel-runtime": "^6.22.0",
+ "babel-types": "^6.24.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-es2015-spread": {
@@ -1060,7 +1530,11 @@
"integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-runtime": "6.26.0"
+=======
+ "babel-runtime": "^6.22.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-es2015-sticky-regex": {
@@ -1069,9 +1543,15 @@
"integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-helper-regex": "6.26.0",
"babel-runtime": "6.26.0",
"babel-types": "6.26.0"
+=======
+ "babel-helper-regex": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-types": "^6.24.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-es2015-template-literals": {
@@ -1080,7 +1560,11 @@
"integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-runtime": "6.26.0"
+=======
+ "babel-runtime": "^6.22.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-es2015-typeof-symbol": {
@@ -1089,7 +1573,11 @@
"integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-runtime": "6.26.0"
+=======
+ "babel-runtime": "^6.22.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-es2015-unicode-regex": {
@@ -1098,9 +1586,15 @@
"integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-helper-regex": "6.26.0",
"babel-runtime": "6.26.0",
"regexpu-core": "2.0.0"
+=======
+ "babel-helper-regex": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "regexpu-core": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-exponentiation-operator": {
@@ -1109,9 +1603,15 @@
"integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-helper-builder-binary-assignment-operator-visitor": "6.24.1",
"babel-plugin-syntax-exponentiation-operator": "6.13.0",
"babel-runtime": "6.26.0"
+=======
+ "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1",
+ "babel-plugin-syntax-exponentiation-operator": "^6.8.0",
+ "babel-runtime": "^6.22.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-object-rest-spread": {
@@ -1120,8 +1620,13 @@
"integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-plugin-syntax-object-rest-spread": "6.13.0",
"babel-runtime": "6.26.0"
+=======
+ "babel-plugin-syntax-object-rest-spread": "^6.8.0",
+ "babel-runtime": "^6.26.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-regenerator": {
@@ -1130,7 +1635,11 @@
"integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"regenerator-transform": "0.10.1"
+=======
+ "regenerator-transform": "^0.10.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-runtime": {
@@ -1139,7 +1648,11 @@
"integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-runtime": "6.26.0"
+=======
+ "babel-runtime": "^6.22.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-strict-mode": {
@@ -1148,8 +1661,13 @@
"integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-runtime": "6.26.0",
"babel-types": "6.26.0"
+=======
+ "babel-runtime": "^6.22.0",
+ "babel-types": "^6.24.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-plugin-transform-vue-jsx": {
@@ -1158,7 +1676,11 @@
"integrity": "sha512-W39X07/n3oJMQd8tALBO+440NraGSF//Lo1ydd/9Nme3+QiRGFBb1Q39T9iixh0jZPPbfv3so18tNoIgLatymw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"esutils": "2.0.2"
+=======
+ "esutils": "^2.0.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-preset-env": {
@@ -1167,6 +1689,7 @@
"integrity": "sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-plugin-check-es2015-constants": "6.22.0",
"babel-plugin-syntax-trailing-function-commas": "6.22.0",
"babel-plugin-transform-async-to-generator": "6.24.1",
@@ -1197,6 +1720,38 @@
"browserslist": "3.2.8",
"invariant": "2.2.4",
"semver": "5.6.0"
+=======
+ "babel-plugin-check-es2015-constants": "^6.22.0",
+ "babel-plugin-syntax-trailing-function-commas": "^6.22.0",
+ "babel-plugin-transform-async-to-generator": "^6.22.0",
+ "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
+ "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0",
+ "babel-plugin-transform-es2015-block-scoping": "^6.23.0",
+ "babel-plugin-transform-es2015-classes": "^6.23.0",
+ "babel-plugin-transform-es2015-computed-properties": "^6.22.0",
+ "babel-plugin-transform-es2015-destructuring": "^6.23.0",
+ "babel-plugin-transform-es2015-duplicate-keys": "^6.22.0",
+ "babel-plugin-transform-es2015-for-of": "^6.23.0",
+ "babel-plugin-transform-es2015-function-name": "^6.22.0",
+ "babel-plugin-transform-es2015-literals": "^6.22.0",
+ "babel-plugin-transform-es2015-modules-amd": "^6.22.0",
+ "babel-plugin-transform-es2015-modules-commonjs": "^6.23.0",
+ "babel-plugin-transform-es2015-modules-systemjs": "^6.23.0",
+ "babel-plugin-transform-es2015-modules-umd": "^6.23.0",
+ "babel-plugin-transform-es2015-object-super": "^6.22.0",
+ "babel-plugin-transform-es2015-parameters": "^6.23.0",
+ "babel-plugin-transform-es2015-shorthand-properties": "^6.22.0",
+ "babel-plugin-transform-es2015-spread": "^6.22.0",
+ "babel-plugin-transform-es2015-sticky-regex": "^6.22.0",
+ "babel-plugin-transform-es2015-template-literals": "^6.22.0",
+ "babel-plugin-transform-es2015-typeof-symbol": "^6.23.0",
+ "babel-plugin-transform-es2015-unicode-regex": "^6.22.0",
+ "babel-plugin-transform-exponentiation-operator": "^6.22.0",
+ "babel-plugin-transform-regenerator": "^6.22.0",
+ "browserslist": "^3.2.6",
+ "invariant": "^2.2.2",
+ "semver": "^5.3.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"browserslist": {
@@ -1205,8 +1760,13 @@
"integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"caniuse-lite": "1.0.30000921",
"electron-to-chromium": "1.3.91"
+=======
+ "caniuse-lite": "^1.0.30000844",
+ "electron-to-chromium": "^1.3.47"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -1217,10 +1777,17 @@
"integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-plugin-syntax-dynamic-import": "6.18.0",
"babel-plugin-transform-class-properties": "6.24.1",
"babel-plugin-transform-decorators": "6.24.1",
"babel-preset-stage-3": "6.24.1"
+=======
+ "babel-plugin-syntax-dynamic-import": "^6.18.0",
+ "babel-plugin-transform-class-properties": "^6.24.1",
+ "babel-plugin-transform-decorators": "^6.24.1",
+ "babel-preset-stage-3": "^6.24.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-preset-stage-3": {
@@ -1229,11 +1796,19 @@
"integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-plugin-syntax-trailing-function-commas": "6.22.0",
"babel-plugin-transform-async-generator-functions": "6.24.1",
"babel-plugin-transform-async-to-generator": "6.24.1",
"babel-plugin-transform-exponentiation-operator": "6.24.1",
"babel-plugin-transform-object-rest-spread": "6.26.0"
+=======
+ "babel-plugin-syntax-trailing-function-commas": "^6.22.0",
+ "babel-plugin-transform-async-generator-functions": "^6.24.1",
+ "babel-plugin-transform-async-to-generator": "^6.24.1",
+ "babel-plugin-transform-exponentiation-operator": "^6.24.1",
+ "babel-plugin-transform-object-rest-spread": "^6.22.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-register": {
@@ -1242,6 +1817,7 @@
"integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-core": "6.26.3",
"babel-runtime": "6.26.0",
"core-js": "2.6.0",
@@ -1249,6 +1825,15 @@
"lodash": "4.17.11",
"mkdirp": "0.5.1",
"source-map-support": "0.4.18"
+=======
+ "babel-core": "^6.26.0",
+ "babel-runtime": "^6.26.0",
+ "core-js": "^2.5.0",
+ "home-or-tmp": "^2.0.0",
+ "lodash": "^4.17.4",
+ "mkdirp": "^0.5.1",
+ "source-map-support": "^0.4.15"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-runtime": {
@@ -1257,8 +1842,13 @@
"integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"core-js": "2.6.0",
"regenerator-runtime": "0.11.1"
+=======
+ "core-js": "^2.4.0",
+ "regenerator-runtime": "^0.11.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-template": {
@@ -1267,11 +1857,19 @@
"integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-runtime": "6.26.0",
"babel-traverse": "6.26.0",
"babel-types": "6.26.0",
"babylon": "6.18.0",
"lodash": "4.17.11"
+=======
+ "babel-runtime": "^6.26.0",
+ "babel-traverse": "^6.26.0",
+ "babel-types": "^6.26.0",
+ "babylon": "^6.18.0",
+ "lodash": "^4.17.4"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-traverse": {
@@ -1280,6 +1878,7 @@
"integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-code-frame": "6.26.0",
"babel-messages": "6.23.0",
"babel-runtime": "6.26.0",
@@ -1289,6 +1888,17 @@
"globals": "9.18.0",
"invariant": "2.2.4",
"lodash": "4.17.11"
+=======
+ "babel-code-frame": "^6.26.0",
+ "babel-messages": "^6.23.0",
+ "babel-runtime": "^6.26.0",
+ "babel-types": "^6.26.0",
+ "babylon": "^6.18.0",
+ "debug": "^2.6.8",
+ "globals": "^9.18.0",
+ "invariant": "^2.2.2",
+ "lodash": "^4.17.4"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babel-types": {
@@ -1297,10 +1907,17 @@
"integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-runtime": "6.26.0",
"esutils": "2.0.2",
"lodash": "4.17.11",
"to-fast-properties": "1.0.3"
+=======
+ "babel-runtime": "^6.26.0",
+ "esutils": "^2.0.2",
+ "lodash": "^4.17.4",
+ "to-fast-properties": "^1.0.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"babylon": {
@@ -1321,6 +1938,7 @@
"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"cache-base": "1.0.1",
"class-utils": "0.3.6",
"component-emitter": "1.2.1",
@@ -1328,6 +1946,15 @@
"isobject": "3.0.1",
"mixin-deep": "1.3.1",
"pascalcase": "0.1.1"
+=======
+ "cache-base": "^1.0.1",
+ "class-utils": "^0.3.5",
+ "component-emitter": "^1.2.1",
+ "define-property": "^1.0.0",
+ "isobject": "^3.0.1",
+ "mixin-deep": "^1.2.0",
+ "pascalcase": "^0.1.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"define-property": {
@@ -1336,7 +1963,11 @@
"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-descriptor": "1.0.2"
+=======
+ "is-descriptor": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"is-accessor-descriptor": {
@@ -1345,7 +1976,11 @@
"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"kind-of": "6.0.2"
+=======
+ "kind-of": "^6.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"is-data-descriptor": {
@@ -1354,7 +1989,11 @@
"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"kind-of": "6.0.2"
+=======
+ "kind-of": "^6.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"is-descriptor": {
@@ -1363,9 +2002,15 @@
"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-accessor-descriptor": "1.0.0",
"is-data-descriptor": "1.0.0",
"kind-of": "6.0.2"
+=======
+ "is-accessor-descriptor": "^1.0.0",
+ "is-data-descriptor": "^1.0.0",
+ "kind-of": "^6.0.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"kind-of": {
@@ -1388,15 +2033,33 @@
"integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "bcrypt-pbkdf": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+ "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+ "dev": true,
+ "requires": {
+ "tweetnacl": "^0.14.3"
+ }
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"bfj-node4": {
"version": "5.3.1",
"resolved": "https://registry.npmjs.org/bfj-node4/-/bfj-node4-5.3.1.tgz",
"integrity": "sha512-SOmOsowQWfXc7ybFARsK3C4MCOWzERaOMV/Fl3Tgjs+5dJWyzo3oa127jL44eMbQiAN17J7SvAs2TRxEScTUmg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"bluebird": "3.5.3",
"check-types": "7.4.0",
"tryer": "1.0.1"
+=======
+ "bluebird": "^3.5.1",
+ "check-types": "^7.3.0",
+ "tryer": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"big.js": {
@@ -1411,6 +2074,18 @@
"integrity": "sha512-DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "block-stream": {
+ "version": "0.0.9",
+ "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+ "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
+ "dev": true,
+ "requires": {
+ "inherits": "~2.0.0"
+ }
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"bluebird": {
"version": "3.5.3",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz",
@@ -1430,6 +2105,7 @@
"dev": true,
"requires": {
"bytes": "3.0.0",
+<<<<<<< HEAD
"content-type": "1.0.4",
"debug": "2.6.9",
"depd": "1.1.2",
@@ -1439,6 +2115,17 @@
"qs": "6.5.2",
"raw-body": "2.3.3",
"type-is": "1.6.16"
+=======
+ "content-type": "~1.0.4",
+ "debug": "2.6.9",
+ "depd": "~1.1.2",
+ "http-errors": "~1.6.3",
+ "iconv-lite": "0.4.23",
+ "on-finished": "~2.3.0",
+ "qs": "6.5.2",
+ "raw-body": "2.3.3",
+ "type-is": "~1.6.16"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"iconv-lite": {
@@ -1447,7 +2134,11 @@
"integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"safer-buffer": "2.1.2"
+=======
+ "safer-buffer": ">= 2.1.2 < 3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -1458,12 +2149,21 @@
"integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"array-flatten": "2.1.2",
"deep-equal": "1.0.1",
"dns-equal": "1.0.0",
"dns-txt": "2.0.2",
"multicast-dns": "6.2.3",
"multicast-dns-service-types": "1.1.0"
+=======
+ "array-flatten": "^2.1.0",
+ "deep-equal": "^1.0.1",
+ "dns-equal": "^1.0.0",
+ "dns-txt": "^2.0.2",
+ "multicast-dns": "^6.0.1",
+ "multicast-dns-service-types": "^1.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"array-flatten": {
@@ -1486,7 +2186,11 @@
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"balanced-match": "1.0.0",
+=======
+ "balanced-match": "^1.0.0",
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"concat-map": "0.0.1"
}
},
@@ -1496,6 +2200,7 @@
"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"arr-flatten": "1.1.0",
"array-unique": "0.3.2",
"extend-shallow": "2.0.1",
@@ -1506,6 +2211,18 @@
"snapdragon-node": "2.1.1",
"split-string": "3.1.0",
"to-regex": "3.0.2"
+=======
+ "arr-flatten": "^1.1.0",
+ "array-unique": "^0.3.2",
+ "extend-shallow": "^2.0.1",
+ "fill-range": "^4.0.0",
+ "isobject": "^3.0.1",
+ "repeat-element": "^1.1.2",
+ "snapdragon": "^0.8.1",
+ "snapdragon-node": "^2.0.1",
+ "split-string": "^3.0.2",
+ "to-regex": "^3.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"extend-shallow": {
@@ -1514,7 +2231,11 @@
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-extendable": "0.1.1"
+=======
+ "is-extendable": "^0.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -1531,12 +2252,21 @@
"integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"buffer-xor": "1.0.3",
"cipher-base": "1.0.4",
"create-hash": "1.2.0",
"evp_bytestokey": "1.0.3",
"inherits": "2.0.3",
"safe-buffer": "5.1.2"
+=======
+ "buffer-xor": "^1.0.3",
+ "cipher-base": "^1.0.0",
+ "create-hash": "^1.1.0",
+ "evp_bytestokey": "^1.0.3",
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"browserify-cipher": {
@@ -1545,9 +2275,15 @@
"integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"browserify-aes": "1.2.0",
"browserify-des": "1.0.2",
"evp_bytestokey": "1.0.3"
+=======
+ "browserify-aes": "^1.0.4",
+ "browserify-des": "^1.0.0",
+ "evp_bytestokey": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"browserify-des": {
@@ -1556,10 +2292,17 @@
"integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"cipher-base": "1.0.4",
"des.js": "1.0.0",
"inherits": "2.0.3",
"safe-buffer": "5.1.2"
+=======
+ "cipher-base": "^1.0.1",
+ "des.js": "^1.0.0",
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.1.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"browserify-rsa": {
@@ -1568,8 +2311,13 @@
"integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"bn.js": "4.11.8",
"randombytes": "2.0.6"
+=======
+ "bn.js": "^4.1.0",
+ "randombytes": "^2.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"browserify-sign": {
@@ -1578,6 +2326,7 @@
"integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"bn.js": "4.11.8",
"browserify-rsa": "4.0.1",
"create-hash": "1.2.0",
@@ -1585,6 +2334,15 @@
"elliptic": "6.4.1",
"inherits": "2.0.3",
"parse-asn1": "5.1.1"
+=======
+ "bn.js": "^4.1.1",
+ "browserify-rsa": "^4.0.0",
+ "create-hash": "^1.1.0",
+ "create-hmac": "^1.1.2",
+ "elliptic": "^6.0.0",
+ "inherits": "^2.0.1",
+ "parse-asn1": "^5.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"browserify-zlib": {
@@ -1593,7 +2351,11 @@
"integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"pako": "1.0.7"
+=======
+ "pako": "~1.0.5"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"browserslist": {
@@ -1602,8 +2364,13 @@
"integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"caniuse-lite": "1.0.30000921",
"electron-to-chromium": "1.3.91"
+=======
+ "caniuse-lite": "^1.0.30000792",
+ "electron-to-chromium": "^1.3.30"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"buffer": {
@@ -1612,9 +2379,15 @@
"integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"base64-js": "1.3.0",
"ieee754": "1.1.12",
"isarray": "1.0.0"
+=======
+ "base64-js": "^1.0.2",
+ "ieee754": "^1.1.4",
+ "isarray": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"buffer-from": {
@@ -1659,6 +2432,7 @@
"integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"bluebird": "3.5.3",
"chownr": "1.1.1",
"glob": "7.1.3",
@@ -1672,6 +2446,21 @@
"ssri": "5.3.0",
"unique-filename": "1.1.1",
"y18n": "4.0.0"
+=======
+ "bluebird": "^3.5.1",
+ "chownr": "^1.0.1",
+ "glob": "^7.1.2",
+ "graceful-fs": "^4.1.11",
+ "lru-cache": "^4.1.1",
+ "mississippi": "^2.0.0",
+ "mkdirp": "^0.5.1",
+ "move-concurrently": "^1.0.1",
+ "promise-inflight": "^1.0.1",
+ "rimraf": "^2.6.2",
+ "ssri": "^5.2.4",
+ "unique-filename": "^1.1.0",
+ "y18n": "^4.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"cache-base": {
@@ -1680,6 +2469,7 @@
"integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"collection-visit": "1.0.0",
"component-emitter": "1.2.1",
"get-value": "2.0.6",
@@ -1689,6 +2479,17 @@
"to-object-path": "0.3.0",
"union-value": "1.0.0",
"unset-value": "1.0.0"
+=======
+ "collection-visit": "^1.0.0",
+ "component-emitter": "^1.2.1",
+ "get-value": "^2.0.6",
+ "has-value": "^1.0.0",
+ "isobject": "^3.0.1",
+ "set-value": "^2.0.0",
+ "to-object-path": "^0.3.0",
+ "union-value": "^1.0.0",
+ "unset-value": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"caller-path": {
@@ -1697,7 +2498,11 @@
"integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"callsites": "0.2.0"
+=======
+ "callsites": "^0.2.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"callsites": {
@@ -1712,8 +2517,13 @@
"integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"no-case": "2.3.2",
"upper-case": "1.1.3"
+=======
+ "no-case": "^2.2.0",
+ "upper-case": "^1.1.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"camelcase": {
@@ -1728,8 +2538,13 @@
"integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"camelcase": "2.1.1",
"map-obj": "1.0.1"
+=======
+ "camelcase": "^2.0.0",
+ "map-obj": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"camelcase": {
@@ -1746,10 +2561,17 @@
"integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"browserslist": "1.7.7",
"caniuse-db": "1.0.30000921",
"lodash.memoize": "4.1.2",
"lodash.uniq": "4.5.0"
+=======
+ "browserslist": "^1.3.6",
+ "caniuse-db": "^1.0.30000529",
+ "lodash.memoize": "^4.1.2",
+ "lodash.uniq": "^4.5.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"browserslist": {
@@ -1758,8 +2580,13 @@
"integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"caniuse-db": "1.0.30000921",
"electron-to-chromium": "1.3.91"
+=======
+ "caniuse-db": "^1.0.30000639",
+ "electron-to-chromium": "^1.2.7"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -1776,14 +2603,28 @@
"integrity": "sha512-Bu09ciy0lMWLgpYC77I0YGuI8eFRBPPzaSOYJK1jTI64txCphYCqnWbxJYjHABYVt/TYX/p3jNjLBR87u1Bfpw==",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "caseless": {
+ "version": "0.12.0",
+ "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+ "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+ "dev": true
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"center-align": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
"integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"align-text": "0.1.4",
"lazy-cache": "1.0.4"
+=======
+ "align-text": "^0.1.3",
+ "lazy-cache": "^1.0.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"chalk": {
@@ -1792,9 +2633,15 @@
"integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "3.2.1",
"escape-string-regexp": "1.0.5",
"supports-color": "5.5.0"
+=======
+ "ansi-styles": "^3.2.1",
+ "escape-string-regexp": "^1.0.5",
+ "supports-color": "^5.3.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"chardet": {
@@ -1815,6 +2662,7 @@
"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"anymatch": "2.0.0",
"async-each": "1.0.1",
"braces": "2.3.2",
@@ -1827,6 +2675,20 @@
"path-is-absolute": "1.0.1",
"readdirp": "2.2.1",
"upath": "1.1.0"
+=======
+ "anymatch": "^2.0.0",
+ "async-each": "^1.0.0",
+ "braces": "^2.3.0",
+ "glob-parent": "^3.1.0",
+ "inherits": "^2.0.1",
+ "is-binary-path": "^1.0.0",
+ "is-glob": "^4.0.0",
+ "lodash.debounce": "^4.0.8",
+ "normalize-path": "^2.1.1",
+ "path-is-absolute": "^1.0.0",
+ "readdirp": "^2.0.0",
+ "upath": "^1.0.5"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"chownr": {
@@ -1841,8 +2703,13 @@
"integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"inherits": "2.0.3",
"safe-buffer": "5.1.2"
+=======
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"circular-json": {
@@ -1857,7 +2724,11 @@
"integrity": "sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3"
+=======
+ "chalk": "^1.1.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -1872,11 +2743,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"supports-color": {
@@ -1893,10 +2772,17 @@
"integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"arr-union": "3.1.0",
"define-property": "0.2.5",
"isobject": "3.0.1",
"static-extend": "0.1.2"
+=======
+ "arr-union": "^3.1.0",
+ "define-property": "^0.2.5",
+ "isobject": "^3.0.0",
+ "static-extend": "^0.1.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"define-property": {
@@ -1905,7 +2791,11 @@
"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-descriptor": "0.1.6"
+=======
+ "is-descriptor": "^0.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -1916,7 +2806,11 @@
"integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"source-map": "0.6.1"
+=======
+ "source-map": "~0.6.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"cli-cursor": {
@@ -1925,7 +2819,11 @@
"integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"restore-cursor": "2.0.0"
+=======
+ "restore-cursor": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"cli-spinners": {
@@ -1946,8 +2844,13 @@
"integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"center-align": "0.1.3",
"right-align": "0.1.3",
+=======
+ "center-align": "^0.1.1",
+ "right-align": "^0.1.1",
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"wordwrap": "0.0.2"
},
"dependencies": {
@@ -1965,6 +2868,38 @@
"integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "clone-deep": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz",
+ "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
+ "dev": true,
+ "requires": {
+ "for-own": "^1.0.0",
+ "is-plain-object": "^2.0.4",
+ "kind-of": "^6.0.0",
+ "shallow-clone": "^1.0.0"
+ },
+ "dependencies": {
+ "for-own": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+ "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
+ "dev": true,
+ "requires": {
+ "for-in": "^1.0.1"
+ }
+ },
+ "kind-of": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+ "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+ "dev": true
+ }
+ }
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"co": {
"version": "4.6.0",
"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -1977,7 +2912,11 @@
"integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"q": "1.5.1"
+=======
+ "q": "^1.1.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"coalescy": {
@@ -1998,8 +2937,13 @@
"integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"map-visit": "1.0.0",
"object-visit": "1.0.1"
+=======
+ "map-visit": "^1.0.0",
+ "object-visit": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"color": {
@@ -2008,9 +2952,15 @@
"integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"clone": "1.0.4",
"color-convert": "1.9.3",
"color-string": "0.3.0"
+=======
+ "clone": "^1.0.2",
+ "color-convert": "^1.3.0",
+ "color-string": "^0.3.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"color-convert": {
@@ -2034,7 +2984,11 @@
"integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"color-name": "1.1.3"
+=======
+ "color-name": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"colormin": {
@@ -2043,9 +2997,15 @@
"integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"color": "0.11.4",
"css-color-names": "0.0.4",
"has": "1.0.3"
+=======
+ "color": "^0.11.0",
+ "css-color-names": "0.0.4",
+ "has": "^1.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"colors": {
@@ -2054,6 +3014,18 @@
"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "combined-stream": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
+ "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
+ "dev": true,
+ "requires": {
+ "delayed-stream": "~1.0.0"
+ }
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"commander": {
"version": "2.17.1",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
@@ -2078,7 +3050,11 @@
"integrity": "sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"mime-db": "1.37.0"
+=======
+ "mime-db": ">= 1.36.0 < 2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"compression": {
@@ -2087,6 +3063,7 @@
"integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"accepts": "1.3.5",
"bytes": "3.0.0",
"compressible": "2.0.15",
@@ -2094,6 +3071,15 @@
"on-headers": "1.0.1",
"safe-buffer": "5.1.2",
"vary": "1.1.2"
+=======
+ "accepts": "~1.3.5",
+ "bytes": "3.0.0",
+ "compressible": "~2.0.14",
+ "debug": "2.6.9",
+ "on-headers": "~1.0.1",
+ "safe-buffer": "5.1.2",
+ "vary": "~1.1.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"concat-map": {
@@ -2108,10 +3094,17 @@
"integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"buffer-from": "1.1.1",
"inherits": "2.0.3",
"readable-stream": "2.3.6",
"typedarray": "0.0.6"
+=======
+ "buffer-from": "^1.0.0",
+ "inherits": "^2.0.3",
+ "readable-stream": "^2.2.2",
+ "typedarray": "^0.0.6"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"connect-history-api-fallback": {
@@ -2126,16 +3119,32 @@
"integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"date-now": "0.1.4"
}
},
+=======
+ "date-now": "^0.1.4"
+ }
+ },
+ "console-control-strings": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+ "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+ "dev": true
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"consolidate": {
"version": "0.14.5",
"resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.14.5.tgz",
"integrity": "sha1-WiUEe8dvcwcmZ8jLUsmJiI9JTGM=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"bluebird": "3.5.3"
+=======
+ "bluebird": "^3.1.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"constants-browserify": {
@@ -2168,7 +3177,11 @@
"integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"safe-buffer": "5.1.2"
+=======
+ "safe-buffer": "~5.1.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"cookie": {
@@ -2189,12 +3202,21 @@
"integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"aproba": "1.2.0",
"fs-write-stream-atomic": "1.0.10",
"iferr": "0.1.5",
"mkdirp": "0.5.1",
"rimraf": "2.6.2",
"run-queue": "1.0.3"
+=======
+ "aproba": "^1.1.1",
+ "fs-write-stream-atomic": "^1.0.8",
+ "iferr": "^0.1.5",
+ "mkdirp": "^0.5.1",
+ "rimraf": "^2.5.4",
+ "run-queue": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"copy-descriptor": {
@@ -2209,6 +3231,7 @@
"integrity": "sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"cacache": "10.0.4",
"find-cache-dir": "1.0.0",
"globby": "7.1.1",
@@ -2217,6 +3240,16 @@
"minimatch": "3.0.4",
"p-limit": "1.3.0",
"serialize-javascript": "1.5.0"
+=======
+ "cacache": "^10.0.4",
+ "find-cache-dir": "^1.0.0",
+ "globby": "^7.1.1",
+ "is-glob": "^4.0.0",
+ "loader-utils": "^1.1.0",
+ "minimatch": "^3.0.4",
+ "p-limit": "^1.0.0",
+ "serialize-javascript": "^1.4.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"core-js": {
@@ -2237,10 +3270,17 @@
"integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-directory": "0.3.1",
"js-yaml": "3.12.0",
"parse-json": "4.0.0",
"require-from-string": "2.0.2"
+=======
+ "is-directory": "^0.3.1",
+ "js-yaml": "^3.9.0",
+ "parse-json": "^4.0.0",
+ "require-from-string": "^2.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"esprima": {
@@ -2255,8 +3295,13 @@
"integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"argparse": "1.0.10",
"esprima": "4.0.1"
+=======
+ "argparse": "^1.0.7",
+ "esprima": "^4.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"parse-json": {
@@ -2265,8 +3310,13 @@
"integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"error-ex": "1.3.2",
"json-parse-better-errors": "1.0.2"
+=======
+ "error-ex": "^1.3.1",
+ "json-parse-better-errors": "^1.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -2277,8 +3327,13 @@
"integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"bn.js": "4.11.8",
"elliptic": "6.4.1"
+=======
+ "bn.js": "^4.1.0",
+ "elliptic": "^6.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"create-hash": {
@@ -2287,11 +3342,19 @@
"integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"cipher-base": "1.0.4",
"inherits": "2.0.3",
"md5.js": "1.3.5",
"ripemd160": "2.0.2",
"sha.js": "2.4.11"
+=======
+ "cipher-base": "^1.0.1",
+ "inherits": "^2.0.1",
+ "md5.js": "^1.3.4",
+ "ripemd160": "^2.0.1",
+ "sha.js": "^2.4.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"create-hmac": {
@@ -2300,12 +3363,21 @@
"integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"cipher-base": "1.0.4",
"create-hash": "1.2.0",
"inherits": "2.0.3",
"ripemd160": "2.0.2",
"safe-buffer": "5.1.2",
"sha.js": "2.4.11"
+=======
+ "cipher-base": "^1.0.3",
+ "create-hash": "^1.1.0",
+ "inherits": "^2.0.1",
+ "ripemd160": "^2.0.0",
+ "safe-buffer": "^5.0.1",
+ "sha.js": "^2.4.8"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"cross-spawn": {
@@ -2314,9 +3386,15 @@
"integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"lru-cache": "4.1.5",
"shebang-command": "1.2.0",
"which": "1.3.1"
+=======
+ "lru-cache": "^4.0.1",
+ "shebang-command": "^1.2.0",
+ "which": "^1.2.9"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"crypto-browserify": {
@@ -2325,6 +3403,7 @@
"integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"browserify-cipher": "1.0.1",
"browserify-sign": "4.0.4",
"create-ecdh": "4.0.3",
@@ -2336,6 +3415,19 @@
"public-encrypt": "4.0.3",
"randombytes": "2.0.6",
"randomfill": "1.0.4"
+=======
+ "browserify-cipher": "^1.0.0",
+ "browserify-sign": "^4.0.0",
+ "create-ecdh": "^4.0.0",
+ "create-hash": "^1.1.0",
+ "create-hmac": "^1.1.0",
+ "diffie-hellman": "^5.0.0",
+ "inherits": "^2.0.1",
+ "pbkdf2": "^3.0.3",
+ "public-encrypt": "^4.0.0",
+ "randombytes": "^2.0.0",
+ "randomfill": "^1.0.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"css-color-names": {
@@ -2350,6 +3442,7 @@
"integrity": "sha512-wovHgjAx8ZIMGSL8pTys7edA1ClmzxHeY6n/d97gg5odgsxEgKjULPR0viqyC+FWMCL9sfqoC/QCUBo62tLvPg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-code-frame": "6.26.0",
"css-selector-tokenizer": "0.7.1",
"cssnano": "3.10.0",
@@ -2364,6 +3457,22 @@
"postcss-modules-values": "1.3.0",
"postcss-value-parser": "3.3.1",
"source-list-map": "2.0.1"
+=======
+ "babel-code-frame": "^6.26.0",
+ "css-selector-tokenizer": "^0.7.0",
+ "cssnano": "^3.10.0",
+ "icss-utils": "^2.1.0",
+ "loader-utils": "^1.0.2",
+ "lodash.camelcase": "^4.3.0",
+ "object-assign": "^4.1.1",
+ "postcss": "^5.0.6",
+ "postcss-modules-extract-imports": "^1.2.0",
+ "postcss-modules-local-by-default": "^1.2.0",
+ "postcss-modules-scope": "^1.1.0",
+ "postcss-modules-values": "^1.3.0",
+ "postcss-value-parser": "^3.3.0",
+ "source-list-map": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -2378,11 +3487,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"supports-color": {
@@ -2405,10 +3522,17 @@
"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"js-base64": "2.4.9",
"source-map": "0.5.7",
"supports-color": "3.2.3"
+=======
+ "chalk": "^1.1.3",
+ "js-base64": "^2.1.9",
+ "source-map": "^0.5.6",
+ "supports-color": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map": {
@@ -2423,7 +3547,11 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "1.0.0"
+=======
+ "has-flag": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -2434,10 +3562,17 @@
"integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"boolbase": "1.0.0",
"css-what": "2.1.2",
"domutils": "1.5.1",
"nth-check": "1.0.2"
+=======
+ "boolbase": "~1.0.0",
+ "css-what": "2.1",
+ "domutils": "1.5.1",
+ "nth-check": "~1.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"css-selector-tokenizer": {
@@ -2446,9 +3581,15 @@
"integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"cssesc": "0.1.0",
"fastparse": "1.1.2",
"regexpu-core": "1.0.0"
+=======
+ "cssesc": "^0.1.0",
+ "fastparse": "^1.1.1",
+ "regexpu-core": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"regexpu-core": {
@@ -2457,9 +3598,15 @@
"integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"regenerate": "1.4.0",
"regjsgen": "0.2.0",
"regjsparser": "0.1.5"
+=======
+ "regenerate": "^1.2.1",
+ "regjsgen": "^0.2.0",
+ "regjsparser": "^0.1.4"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -2482,6 +3629,7 @@
"integrity": "sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"autoprefixer": "6.7.7",
"decamelize": "1.2.0",
"defined": "1.0.0",
@@ -2514,6 +3662,40 @@
"postcss-unique-selectors": "2.0.2",
"postcss-value-parser": "3.3.1",
"postcss-zindex": "2.2.0"
+=======
+ "autoprefixer": "^6.3.1",
+ "decamelize": "^1.1.2",
+ "defined": "^1.0.0",
+ "has": "^1.0.1",
+ "object-assign": "^4.0.1",
+ "postcss": "^5.0.14",
+ "postcss-calc": "^5.2.0",
+ "postcss-colormin": "^2.1.8",
+ "postcss-convert-values": "^2.3.4",
+ "postcss-discard-comments": "^2.0.4",
+ "postcss-discard-duplicates": "^2.0.1",
+ "postcss-discard-empty": "^2.0.1",
+ "postcss-discard-overridden": "^0.1.1",
+ "postcss-discard-unused": "^2.2.1",
+ "postcss-filter-plugins": "^2.0.0",
+ "postcss-merge-idents": "^2.1.5",
+ "postcss-merge-longhand": "^2.0.1",
+ "postcss-merge-rules": "^2.0.3",
+ "postcss-minify-font-values": "^1.0.2",
+ "postcss-minify-gradients": "^1.0.1",
+ "postcss-minify-params": "^1.0.4",
+ "postcss-minify-selectors": "^2.0.4",
+ "postcss-normalize-charset": "^1.1.0",
+ "postcss-normalize-url": "^3.0.7",
+ "postcss-ordered-values": "^2.1.0",
+ "postcss-reduce-idents": "^2.2.2",
+ "postcss-reduce-initial": "^1.0.0",
+ "postcss-reduce-transforms": "^1.0.3",
+ "postcss-svgo": "^2.1.1",
+ "postcss-unique-selectors": "^2.0.2",
+ "postcss-value-parser": "^3.2.3",
+ "postcss-zindex": "^2.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -2528,12 +3710,21 @@
"integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"browserslist": "1.7.7",
"caniuse-db": "1.0.30000921",
"normalize-range": "0.1.2",
"num2fraction": "1.2.2",
"postcss": "5.2.18",
"postcss-value-parser": "3.3.1"
+=======
+ "browserslist": "^1.7.6",
+ "caniuse-db": "^1.0.30000634",
+ "normalize-range": "^0.1.2",
+ "num2fraction": "^1.2.2",
+ "postcss": "^5.2.16",
+ "postcss-value-parser": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"browserslist": {
@@ -2542,8 +3733,13 @@
"integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"caniuse-db": "1.0.30000921",
"electron-to-chromium": "1.3.91"
+=======
+ "caniuse-db": "^1.0.30000639",
+ "electron-to-chromium": "^1.2.7"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"chalk": {
@@ -2552,11 +3748,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"supports-color": {
@@ -2579,10 +3783,17 @@
"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"js-base64": "2.4.9",
"source-map": "0.5.7",
"supports-color": "3.2.3"
+=======
+ "chalk": "^1.1.3",
+ "js-base64": "^2.1.9",
+ "source-map": "^0.5.6",
+ "supports-color": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map": {
@@ -2597,7 +3808,11 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "1.0.0"
+=======
+ "has-flag": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -2608,8 +3823,13 @@
"integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"clap": "1.2.3",
"source-map": "0.5.7"
+=======
+ "clap": "^1.0.9",
+ "source-map": "^0.5.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"source-map": {
@@ -2632,7 +3852,11 @@
"integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"array-find-index": "1.0.2"
+=======
+ "array-find-index": "^1.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"cyclist": {
@@ -2647,7 +3871,20 @@
"integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"es5-ext": "0.10.46"
+=======
+ "es5-ext": "^0.10.9"
+ }
+ },
+ "dashdash": {
+ "version": "1.14.1",
+ "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+ "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+ "dev": true,
+ "requires": {
+ "assert-plus": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"date-now": {
@@ -2701,7 +3938,11 @@
"integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"object-keys": "1.0.12"
+=======
+ "object-keys": "^1.0.12"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"define-property": {
@@ -2710,8 +3951,13 @@
"integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-descriptor": "1.0.2",
"isobject": "3.0.1"
+=======
+ "is-descriptor": "^1.0.2",
+ "isobject": "^3.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"is-accessor-descriptor": {
@@ -2720,7 +3966,11 @@
"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"kind-of": "6.0.2"
+=======
+ "kind-of": "^6.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"is-data-descriptor": {
@@ -2729,7 +3979,11 @@
"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"kind-of": "6.0.2"
+=======
+ "kind-of": "^6.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"is-descriptor": {
@@ -2738,9 +3992,15 @@
"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-accessor-descriptor": "1.0.0",
"is-data-descriptor": "1.0.0",
"kind-of": "6.0.2"
+=======
+ "is-accessor-descriptor": "^1.0.0",
+ "is-data-descriptor": "^1.0.0",
+ "kind-of": "^6.0.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"kind-of": {
@@ -2763,12 +4023,21 @@
"integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"globby": "6.1.0",
"is-path-cwd": "1.0.0",
"is-path-in-cwd": "1.0.1",
"p-map": "1.2.0",
"pify": "3.0.0",
"rimraf": "2.6.2"
+=======
+ "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.2.8"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"globby": {
@@ -2777,11 +4046,19 @@
"integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"array-union": "1.0.2",
"glob": "7.1.3",
"object-assign": "4.1.1",
"pify": "2.3.0",
"pinkie-promise": "2.0.1"
+=======
+ "array-union": "^1.0.1",
+ "glob": "^7.0.3",
+ "object-assign": "^4.0.1",
+ "pify": "^2.0.0",
+ "pinkie-promise": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"pify": {
@@ -2794,6 +4071,21 @@
}
}
},
+<<<<<<< HEAD
+=======
+ "delayed-stream": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+ "dev": true
+ },
+ "delegates": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+ "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+ "dev": true
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"depd": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
@@ -2806,8 +4098,13 @@
"integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"inherits": "2.0.3",
"minimalistic-assert": "1.0.1"
+=======
+ "inherits": "^2.0.1",
+ "minimalistic-assert": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"destroy": {
@@ -2822,7 +4119,11 @@
"integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"repeating": "2.0.1"
+=======
+ "repeating": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"detect-node": {
@@ -2837,9 +4138,15 @@
"integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"bn.js": "4.11.8",
"miller-rabin": "4.0.1",
"randombytes": "2.0.6"
+=======
+ "bn.js": "^4.1.0",
+ "miller-rabin": "^4.0.0",
+ "randombytes": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"dir-glob": {
@@ -2848,8 +4155,13 @@
"integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"arrify": "1.0.1",
"path-type": "3.0.0"
+=======
+ "arrify": "^1.0.1",
+ "path-type": "^3.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"dns-equal": {
@@ -2864,8 +4176,13 @@
"integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ip": "1.1.5",
"safe-buffer": "5.1.2"
+=======
+ "ip": "^1.1.0",
+ "safe-buffer": "^5.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"dns-txt": {
@@ -2874,7 +4191,11 @@
"integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"buffer-indexof": "1.1.1"
+=======
+ "buffer-indexof": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"doctrine": {
@@ -2883,7 +4204,11 @@
"integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"esutils": "2.0.2"
+=======
+ "esutils": "^2.0.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"dom-converter": {
@@ -2892,7 +4217,11 @@
"integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"utila": "0.4.0"
+=======
+ "utila": "~0.4"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"dom-serializer": {
@@ -2901,8 +4230,13 @@
"integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"domelementtype": "1.1.3",
"entities": "1.1.2"
+=======
+ "domelementtype": "~1.1.1",
+ "entities": "~1.1.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"domelementtype": {
@@ -2931,7 +4265,11 @@
"integrity": "sha1-0mRvXlf2w7qxHPbLBdPArPdBJZQ=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"domelementtype": "1.3.1"
+=======
+ "domelementtype": "1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"domutils": {
@@ -2940,8 +4278,13 @@
"integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"dom-serializer": "0.1.0",
"domelementtype": "1.3.1"
+=======
+ "dom-serializer": "0",
+ "domelementtype": "1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"duplexer": {
@@ -2956,10 +4299,27 @@
"integrity": "sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"end-of-stream": "1.4.1",
"inherits": "2.0.3",
"readable-stream": "2.3.6",
"stream-shift": "1.0.0"
+=======
+ "end-of-stream": "^1.0.0",
+ "inherits": "^2.0.1",
+ "readable-stream": "^2.0.0",
+ "stream-shift": "^1.0.0"
+ }
+ },
+ "ecc-jsbn": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+ "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+ "dev": true,
+ "requires": {
+ "jsbn": "~0.1.0",
+ "safer-buffer": "^2.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"ee-first": {
@@ -2986,6 +4346,7 @@
"integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"bn.js": "4.11.8",
"brorand": "1.1.0",
"hash.js": "1.1.7",
@@ -2993,6 +4354,15 @@
"inherits": "2.0.3",
"minimalistic-assert": "1.0.1",
"minimalistic-crypto-utils": "1.0.1"
+=======
+ "bn.js": "^4.4.0",
+ "brorand": "^1.0.1",
+ "hash.js": "^1.0.0",
+ "hmac-drbg": "^1.0.0",
+ "inherits": "^2.0.1",
+ "minimalistic-assert": "^1.0.0",
+ "minimalistic-crypto-utils": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"emojis-list": {
@@ -3013,7 +4383,11 @@
"integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"once": "1.4.0"
+=======
+ "once": "^1.4.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"enhanced-resolve": {
@@ -3022,10 +4396,17 @@
"integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"graceful-fs": "4.1.15",
"memory-fs": "0.4.1",
"object-assign": "4.1.1",
"tapable": "0.2.9"
+=======
+ "graceful-fs": "^4.1.2",
+ "memory-fs": "^0.4.0",
+ "object-assign": "^4.0.1",
+ "tapable": "^0.2.7"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"entities": {
@@ -3040,7 +4421,11 @@
"integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"prr": "1.0.1"
+=======
+ "prr": "~1.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"error-ex": {
@@ -3049,7 +4434,11 @@
"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-arrayish": "0.2.1"
+=======
+ "is-arrayish": "^0.2.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"error-stack-parser": {
@@ -3058,7 +4447,11 @@
"integrity": "sha512-E1fPutRDdIj/hohG0UpT5mayXNCxXP9d+snxFsPU9X0XgccOumKraa3juDMwTUyi7+Bu5+mCGagjg4IYeNbOdw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"stackframe": "1.0.4"
+=======
+ "stackframe": "^1.0.4"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"es-abstract": {
@@ -3067,11 +4460,19 @@
"integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"es-to-primitive": "1.2.0",
"function-bind": "1.1.1",
"has": "1.0.3",
"is-callable": "1.1.4",
"is-regex": "1.0.4"
+=======
+ "es-to-primitive": "^1.1.1",
+ "function-bind": "^1.1.1",
+ "has": "^1.0.1",
+ "is-callable": "^1.1.3",
+ "is-regex": "^1.0.4"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"es-to-primitive": {
@@ -3080,9 +4481,15 @@
"integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-callable": "1.1.4",
"is-date-object": "1.0.1",
"is-symbol": "1.0.2"
+=======
+ "is-callable": "^1.1.4",
+ "is-date-object": "^1.0.1",
+ "is-symbol": "^1.0.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"es5-ext": {
@@ -3091,9 +4498,15 @@
"integrity": "sha512-24XxRvJXNFwEMpJb3nOkiRJKRoupmjYmOPVlI65Qy2SrtxwOTB+g6ODjBKOtwEHbYrhWRty9xxOWLNdClT2djw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"es6-iterator": "2.0.3",
"es6-symbol": "3.1.1",
"next-tick": "1.0.0"
+=======
+ "es6-iterator": "~2.0.3",
+ "es6-symbol": "~3.1.1",
+ "next-tick": "1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"es6-iterator": {
@@ -3102,9 +4515,15 @@
"integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"d": "1.0.0",
"es5-ext": "0.10.46",
"es6-symbol": "3.1.1"
+=======
+ "d": "1",
+ "es5-ext": "^0.10.35",
+ "es6-symbol": "^3.1.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"es6-map": {
@@ -3113,12 +4532,21 @@
"integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"d": "1.0.0",
"es5-ext": "0.10.46",
"es6-iterator": "2.0.3",
"es6-set": "0.1.5",
"es6-symbol": "3.1.1",
"event-emitter": "0.3.5"
+=======
+ "d": "1",
+ "es5-ext": "~0.10.14",
+ "es6-iterator": "~2.0.1",
+ "es6-set": "~0.1.5",
+ "es6-symbol": "~3.1.1",
+ "event-emitter": "~0.3.5"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"es6-set": {
@@ -3127,11 +4555,19 @@
"integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"d": "1.0.0",
"es5-ext": "0.10.46",
"es6-iterator": "2.0.3",
"es6-symbol": "3.1.1",
"event-emitter": "0.3.5"
+=======
+ "d": "1",
+ "es5-ext": "~0.10.14",
+ "es6-iterator": "~2.0.1",
+ "es6-symbol": "3.1.1",
+ "event-emitter": "~0.3.5"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"es6-symbol": {
@@ -3140,8 +4576,13 @@
"integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"d": "1.0.0",
"es5-ext": "0.10.46"
+=======
+ "d": "1",
+ "es5-ext": "~0.10.14"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"es6-weak-map": {
@@ -3150,10 +4591,17 @@
"integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"d": "1.0.0",
"es5-ext": "0.10.46",
"es6-iterator": "2.0.3",
"es6-symbol": "3.1.1"
+=======
+ "d": "1",
+ "es5-ext": "^0.10.14",
+ "es6-iterator": "^2.0.1",
+ "es6-symbol": "^3.1.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"escape-html": {
@@ -3174,10 +4622,17 @@
"integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"es6-map": "0.1.5",
"es6-weak-map": "2.0.2",
"esrecurse": "4.2.1",
"estraverse": "4.2.0"
+=======
+ "es6-map": "^0.1.3",
+ "es6-weak-map": "^2.0.1",
+ "esrecurse": "^4.1.0",
+ "estraverse": "^4.1.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"eslint": {
@@ -3186,6 +4641,7 @@
"integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ajv": "5.5.2",
"babel-code-frame": "6.26.0",
"chalk": "2.4.1",
@@ -3224,6 +4680,46 @@
"strip-json-comments": "2.0.1",
"table": "4.0.2",
"text-table": "0.2.0"
+=======
+ "ajv": "^5.3.0",
+ "babel-code-frame": "^6.22.0",
+ "chalk": "^2.1.0",
+ "concat-stream": "^1.6.0",
+ "cross-spawn": "^5.1.0",
+ "debug": "^3.1.0",
+ "doctrine": "^2.1.0",
+ "eslint-scope": "^3.7.1",
+ "eslint-visitor-keys": "^1.0.0",
+ "espree": "^3.5.4",
+ "esquery": "^1.0.0",
+ "esutils": "^2.0.2",
+ "file-entry-cache": "^2.0.0",
+ "functional-red-black-tree": "^1.0.1",
+ "glob": "^7.1.2",
+ "globals": "^11.0.1",
+ "ignore": "^3.3.3",
+ "imurmurhash": "^0.1.4",
+ "inquirer": "^3.0.6",
+ "is-resolvable": "^1.0.0",
+ "js-yaml": "^3.9.1",
+ "json-stable-stringify-without-jsonify": "^1.0.1",
+ "levn": "^0.3.0",
+ "lodash": "^4.17.4",
+ "minimatch": "^3.0.2",
+ "mkdirp": "^0.5.1",
+ "natural-compare": "^1.4.0",
+ "optionator": "^0.8.2",
+ "path-is-inside": "^1.0.2",
+ "pluralize": "^7.0.0",
+ "progress": "^2.0.0",
+ "regexpp": "^1.0.1",
+ "require-uncached": "^1.0.3",
+ "semver": "^5.3.0",
+ "strip-ansi": "^4.0.0",
+ "strip-json-comments": "~2.0.1",
+ "table": "4.0.2",
+ "text-table": "~0.2.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-regex": {
@@ -3238,7 +4734,11 @@
"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ms": "2.1.1"
+=======
+ "ms": "^2.1.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"esprima": {
@@ -3259,8 +4759,13 @@
"integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"argparse": "1.0.10",
"esprima": "4.0.1"
+=======
+ "argparse": "^1.0.7",
+ "esprima": "^4.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"ms": {
@@ -3275,7 +4780,11 @@
"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-regex": "3.0.0"
+=======
+ "ansi-regex": "^3.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -3292,11 +4801,19 @@
"integrity": "sha1-J4h0Q1psRuwdlPoLH/SU4w7wQpA=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"coalescy": "1.0.0",
"extend": "3.0.2",
"minimist": "1.2.0",
"text-table": "0.2.0"
+=======
+ "chalk": "^1.0.0",
+ "coalescy": "1.0.0",
+ "extend": "^3.0.0",
+ "minimist": "^1.2.0",
+ "text-table": "^0.2.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -3311,11 +4828,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"minimist": {
@@ -3338,8 +4863,13 @@
"integrity": "sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"debug": "2.6.9",
"resolve": "1.8.1"
+=======
+ "debug": "^2.6.9",
+ "resolve": "^1.5.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"eslint-loader": {
@@ -3348,11 +4878,19 @@
"integrity": "sha512-40aN976qSNPyb9ejTqjEthZITpls1SVKtwguahmH1dzGCwQU/vySE+xX33VZmD8csU0ahVNCtFlsPgKqRBiqgg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"loader-fs-cache": "1.0.1",
"loader-utils": "1.1.0",
"object-assign": "4.1.1",
"object-hash": "1.3.1",
"rimraf": "2.6.2"
+=======
+ "loader-fs-cache": "^1.0.0",
+ "loader-utils": "^1.0.2",
+ "object-assign": "^4.0.1",
+ "object-hash": "^1.1.4",
+ "rimraf": "^2.6.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"eslint-module-utils": {
@@ -3361,8 +4899,13 @@
"integrity": "sha1-snA2LNiLGkitMIl2zn+lTphBF0Y=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"debug": "2.6.9",
"pkg-dir": "1.0.0"
+=======
+ "debug": "^2.6.8",
+ "pkg-dir": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"find-up": {
@@ -3371,8 +4914,13 @@
"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"path-exists": "2.1.0",
"pinkie-promise": "2.0.1"
+=======
+ "path-exists": "^2.0.0",
+ "pinkie-promise": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"path-exists": {
@@ -3381,7 +4929,11 @@
"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"pinkie-promise": "2.0.1"
+=======
+ "pinkie-promise": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"pkg-dir": {
@@ -3390,7 +4942,11 @@
"integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"find-up": "1.1.2"
+=======
+ "find-up": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -3401,6 +4957,7 @@
"integrity": "sha512-FpuRtniD/AY6sXByma2Wr0TXvXJ4nA/2/04VPlfpmUDPOpOY264x+ILiwnrk/k4RINgDAyFZByxqPUbSQ5YE7g==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"contains-path": "0.1.0",
"debug": "2.6.9",
"doctrine": "1.5.0",
@@ -3411,6 +4968,18 @@
"minimatch": "3.0.4",
"read-pkg-up": "2.0.0",
"resolve": "1.8.1"
+=======
+ "contains-path": "^0.1.0",
+ "debug": "^2.6.8",
+ "doctrine": "1.5.0",
+ "eslint-import-resolver-node": "^0.3.1",
+ "eslint-module-utils": "^2.2.0",
+ "has": "^1.0.1",
+ "lodash": "^4.17.4",
+ "minimatch": "^3.0.3",
+ "read-pkg-up": "^2.0.0",
+ "resolve": "^1.6.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"doctrine": {
@@ -3419,8 +4988,13 @@
"integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"esutils": "2.0.2",
"isarray": "1.0.0"
+=======
+ "esutils": "^2.0.2",
+ "isarray": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -3431,9 +5005,15 @@
"integrity": "sha512-xhPXrh0Vl/b7870uEbaumb2Q+LxaEcOQ3kS1jtIXanBAwpMre1l5q/l2l/hESYJGEFKuI78bp6Uw50hlpr7B+g==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ignore": "3.3.10",
"minimatch": "3.0.4",
"resolve": "1.8.1",
+=======
+ "ignore": "^3.3.6",
+ "minimatch": "^3.0.4",
+ "resolve": "^1.3.3",
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"semver": "5.3.0"
},
"dependencies": {
@@ -3463,7 +5043,11 @@
"integrity": "sha512-esETKhVMI7Vdli70Wt4bvAwnZBJeM0pxVX9Yb0wWKxdCJc2EADalVYK/q2FzMw8oKN0wPMdqVCKS8kmR89recA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"vue-eslint-parser": "2.0.3"
+=======
+ "vue-eslint-parser": "^2.0.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"eslint-scope": {
@@ -3472,8 +5056,13 @@
"integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"esrecurse": "4.2.1",
"estraverse": "4.2.0"
+=======
+ "esrecurse": "^4.1.0",
+ "estraverse": "^4.1.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"eslint-visitor-keys": {
@@ -3488,8 +5077,13 @@
"integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"acorn": "5.7.3",
"acorn-jsx": "3.0.1"
+=======
+ "acorn": "^5.5.0",
+ "acorn-jsx": "^3.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"esprima": {
@@ -3504,7 +5098,11 @@
"integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"estraverse": "4.2.0"
+=======
+ "estraverse": "^4.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"esrecurse": {
@@ -3513,7 +5111,11 @@
"integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"estraverse": "4.2.0"
+=======
+ "estraverse": "^4.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"estraverse": {
@@ -3540,8 +5142,13 @@
"integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"d": "1.0.0",
"es5-ext": "0.10.46"
+=======
+ "d": "1",
+ "es5-ext": "~0.10.14"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"eventemitter3": {
@@ -3562,7 +5169,11 @@
"integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"original": "1.0.2"
+=======
+ "original": ">=0.0.5"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"evp_bytestokey": {
@@ -3571,8 +5182,13 @@
"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"md5.js": "1.3.5",
"safe-buffer": "5.1.2"
+=======
+ "md5.js": "^1.3.4",
+ "safe-buffer": "^5.1.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"execa": {
@@ -3581,6 +5197,7 @@
"integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"cross-spawn": "5.1.0",
"get-stream": "3.0.0",
"is-stream": "1.1.0",
@@ -3588,6 +5205,15 @@
"p-finally": "1.0.0",
"signal-exit": "3.0.2",
"strip-eof": "1.0.0"
+=======
+ "cross-spawn": "^5.0.1",
+ "get-stream": "^3.0.0",
+ "is-stream": "^1.1.0",
+ "npm-run-path": "^2.0.0",
+ "p-finally": "^1.0.0",
+ "signal-exit": "^3.0.0",
+ "strip-eof": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"expand-brackets": {
@@ -3596,6 +5222,7 @@
"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"debug": "2.6.9",
"define-property": "0.2.5",
"extend-shallow": "2.0.1",
@@ -3603,6 +5230,15 @@
"regex-not": "1.0.2",
"snapdragon": "0.8.2",
"to-regex": "3.0.2"
+=======
+ "debug": "^2.3.3",
+ "define-property": "^0.2.5",
+ "extend-shallow": "^2.0.1",
+ "posix-character-classes": "^0.1.0",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"define-property": {
@@ -3611,7 +5247,11 @@
"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-descriptor": "0.1.6"
+=======
+ "is-descriptor": "^0.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"extend-shallow": {
@@ -3620,7 +5260,11 @@
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-extendable": "0.1.1"
+=======
+ "is-extendable": "^0.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -3631,7 +5275,11 @@
"integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"fill-range": "2.2.4"
+=======
+ "fill-range": "^2.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"fill-range": {
@@ -3640,11 +5288,19 @@
"integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-number": "2.1.0",
"isobject": "2.1.0",
"randomatic": "3.1.1",
"repeat-element": "1.1.3",
"repeat-string": "1.6.1"
+=======
+ "is-number": "^2.1.0",
+ "isobject": "^2.0.0",
+ "randomatic": "^3.0.0",
+ "repeat-element": "^1.1.2",
+ "repeat-string": "^1.5.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"is-number": {
@@ -3653,7 +5309,11 @@
"integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"kind-of": "3.2.2"
+=======
+ "kind-of": "^3.0.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"isobject": {
@@ -3673,6 +5333,7 @@
"integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"accepts": "1.3.5",
"array-flatten": "1.1.1",
"body-parser": "1.18.3",
@@ -3695,14 +5356,45 @@
"proxy-addr": "2.0.4",
"qs": "6.5.2",
"range-parser": "1.2.0",
+=======
+ "accepts": "~1.3.5",
+ "array-flatten": "1.1.1",
+ "body-parser": "1.18.3",
+ "content-disposition": "0.5.2",
+ "content-type": "~1.0.4",
+ "cookie": "0.3.1",
+ "cookie-signature": "1.0.6",
+ "debug": "2.6.9",
+ "depd": "~1.1.2",
+ "encodeurl": "~1.0.2",
+ "escape-html": "~1.0.3",
+ "etag": "~1.8.1",
+ "finalhandler": "1.1.1",
+ "fresh": "0.5.2",
+ "merge-descriptors": "1.0.1",
+ "methods": "~1.1.2",
+ "on-finished": "~2.3.0",
+ "parseurl": "~1.3.2",
+ "path-to-regexp": "0.1.7",
+ "proxy-addr": "~2.0.4",
+ "qs": "6.5.2",
+ "range-parser": "~1.2.0",
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"safe-buffer": "5.1.2",
"send": "0.16.2",
"serve-static": "1.13.2",
"setprototypeof": "1.1.0",
+<<<<<<< HEAD
"statuses": "1.4.0",
"type-is": "1.6.16",
"utils-merge": "1.0.1",
"vary": "1.1.2"
+=======
+ "statuses": "~1.4.0",
+ "type-is": "~1.6.16",
+ "utils-merge": "1.0.1",
+ "vary": "~1.1.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"extend": {
@@ -3717,8 +5409,13 @@
"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"assign-symbols": "1.0.0",
"is-extendable": "1.0.1"
+=======
+ "assign-symbols": "^1.0.0",
+ "is-extendable": "^1.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"is-extendable": {
@@ -3727,7 +5424,11 @@
"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-plain-object": "2.0.4"
+=======
+ "is-plain-object": "^2.0.4"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -3738,9 +5439,15 @@
"integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chardet": "0.4.2",
"iconv-lite": "0.4.24",
"tmp": "0.0.33"
+=======
+ "chardet": "^0.4.0",
+ "iconv-lite": "^0.4.17",
+ "tmp": "^0.0.33"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"extglob": {
@@ -3749,6 +5456,7 @@
"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"array-unique": "0.3.2",
"define-property": "1.0.0",
"expand-brackets": "2.1.4",
@@ -3757,6 +5465,16 @@
"regex-not": "1.0.2",
"snapdragon": "0.8.2",
"to-regex": "3.0.2"
+=======
+ "array-unique": "^0.3.2",
+ "define-property": "^1.0.0",
+ "expand-brackets": "^2.1.4",
+ "extend-shallow": "^2.0.1",
+ "fragment-cache": "^0.2.1",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"define-property": {
@@ -3765,7 +5483,11 @@
"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-descriptor": "1.0.2"
+=======
+ "is-descriptor": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"extend-shallow": {
@@ -3774,7 +5496,11 @@
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-extendable": "0.1.1"
+=======
+ "is-extendable": "^0.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"is-accessor-descriptor": {
@@ -3783,7 +5509,11 @@
"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"kind-of": "6.0.2"
+=======
+ "kind-of": "^6.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"is-data-descriptor": {
@@ -3792,7 +5522,11 @@
"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"kind-of": "6.0.2"
+=======
+ "kind-of": "^6.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"is-descriptor": {
@@ -3801,9 +5535,15 @@
"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-accessor-descriptor": "1.0.0",
"is-data-descriptor": "1.0.0",
"kind-of": "6.0.2"
+=======
+ "is-accessor-descriptor": "^1.0.0",
+ "is-data-descriptor": "^1.0.0",
+ "kind-of": "^6.0.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"kind-of": {
@@ -3820,12 +5560,27 @@
"integrity": "sha512-bt/LZ4m5Rqt/Crl2HiKuAl/oqg0psx1tsTLkvWbJen1CtD+fftkZhMaQ9HOtY2gWsl2Wq+sABmMVi9z3DhKWQQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"async": "2.6.1",
"loader-utils": "1.1.0",
"schema-utils": "0.3.0",
"webpack-sources": "1.3.0"
}
},
+=======
+ "async": "^2.4.1",
+ "loader-utils": "^1.1.0",
+ "schema-utils": "^0.3.0",
+ "webpack-sources": "^1.0.1"
+ }
+ },
+ "extsprintf": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+ "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+ "dev": true
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"fast-deep-equal": {
"version": "1.1.0",
"resolved": "http://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
@@ -3856,7 +5611,11 @@
"integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"websocket-driver": "0.7.0"
+=======
+ "websocket-driver": ">=0.5.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"figures": {
@@ -3865,7 +5624,11 @@
"integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"escape-string-regexp": "1.0.5"
+=======
+ "escape-string-regexp": "^1.0.5"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"file-entry-cache": {
@@ -3874,8 +5637,13 @@
"integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"flat-cache": "1.3.4",
"object-assign": "4.1.1"
+=======
+ "flat-cache": "^1.2.1",
+ "object-assign": "^4.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"file-loader": {
@@ -3884,8 +5652,13 @@
"integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"loader-utils": "1.1.0",
"schema-utils": "0.4.7"
+=======
+ "loader-utils": "^1.0.2",
+ "schema-utils": "^0.4.5"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ajv": {
@@ -3894,10 +5667,17 @@
"integrity": "sha512-ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"fast-deep-equal": "2.0.1",
"fast-json-stable-stringify": "2.0.0",
"json-schema-traverse": "0.4.1",
"uri-js": "4.2.2"
+=======
+ "fast-deep-equal": "^2.0.1",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.4.1",
+ "uri-js": "^4.2.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"ajv-keywords": {
@@ -3924,8 +5704,13 @@
"integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ajv": "6.6.1",
"ajv-keywords": "3.2.0"
+=======
+ "ajv": "^6.1.0",
+ "ajv-keywords": "^3.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -3948,10 +5733,17 @@
"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"extend-shallow": "2.0.1",
"is-number": "3.0.0",
"repeat-string": "1.6.1",
"to-regex-range": "2.1.1"
+=======
+ "extend-shallow": "^2.0.1",
+ "is-number": "^3.0.0",
+ "repeat-string": "^1.6.1",
+ "to-regex-range": "^2.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"extend-shallow": {
@@ -3960,7 +5752,11 @@
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-extendable": "0.1.1"
+=======
+ "is-extendable": "^0.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -3972,12 +5768,21 @@
"dev": true,
"requires": {
"debug": "2.6.9",
+<<<<<<< HEAD
"encodeurl": "1.0.2",
"escape-html": "1.0.3",
"on-finished": "2.3.0",
"parseurl": "1.3.2",
"statuses": "1.4.0",
"unpipe": "1.0.0"
+=======
+ "encodeurl": "~1.0.2",
+ "escape-html": "~1.0.3",
+ "on-finished": "~2.3.0",
+ "parseurl": "~1.3.2",
+ "statuses": "~1.4.0",
+ "unpipe": "~1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"find-cache-dir": {
@@ -3986,9 +5791,15 @@
"integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"commondir": "1.0.1",
"make-dir": "1.3.0",
"pkg-dir": "2.0.0"
+=======
+ "commondir": "^1.0.1",
+ "make-dir": "^1.0.0",
+ "pkg-dir": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"find-up": {
@@ -3997,7 +5808,11 @@
"integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"locate-path": "2.0.0"
+=======
+ "locate-path": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"flat-cache": {
@@ -4006,10 +5821,17 @@
"integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"circular-json": "0.3.3",
"graceful-fs": "4.1.15",
"rimraf": "2.6.2",
"write": "0.2.1"
+=======
+ "circular-json": "^0.3.1",
+ "graceful-fs": "^4.1.2",
+ "rimraf": "~2.6.2",
+ "write": "^0.2.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"flatten": {
@@ -4024,8 +5846,13 @@
"integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"inherits": "2.0.3",
"readable-stream": "2.3.6"
+=======
+ "inherits": "^2.0.1",
+ "readable-stream": "^2.0.4"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"follow-redirects": {
@@ -4034,7 +5861,11 @@
"integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"debug": "3.1.0"
+=======
+ "debug": "=3.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"debug": {
@@ -4060,7 +5891,28 @@
"integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"for-in": "1.0.2"
+=======
+ "for-in": "^1.0.1"
+ }
+ },
+ "forever-agent": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+ "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+ "dev": true
+ },
+ "form-data": {
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+ "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+ "dev": true,
+ "requires": {
+ "asynckit": "^0.4.0",
+ "combined-stream": "^1.0.6",
+ "mime-types": "^2.1.12"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"forwarded": {
@@ -4075,7 +5927,11 @@
"integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"map-cache": "0.2.2"
+=======
+ "map-cache": "^0.2.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"fresh": {
@@ -4090,9 +5946,15 @@
"integrity": "sha512-K27M3VK30wVoOarP651zDmb93R9zF28usW4ocaK3mfQeIEI5BPht/EzZs5E8QLLwbLRJQMwscAjDxYPb1FuNiw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"error-stack-parser": "2.0.2",
"string-width": "2.1.1"
+=======
+ "chalk": "^1.1.3",
+ "error-stack-parser": "^2.0.0",
+ "string-width": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -4107,11 +5969,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"supports-color": {
@@ -4128,8 +5998,13 @@
"integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"inherits": "2.0.3",
"readable-stream": "2.3.6"
+=======
+ "inherits": "^2.0.1",
+ "readable-stream": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"fs-write-stream-atomic": {
@@ -4138,10 +6013,17 @@
"integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"graceful-fs": "4.1.15",
"iferr": "0.1.5",
"imurmurhash": "0.1.4",
"readable-stream": "2.3.6"
+=======
+ "graceful-fs": "^4.1.2",
+ "iferr": "^0.1.5",
+ "imurmurhash": "^0.1.4",
+ "readable-stream": "1 || 2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"fs.realpath": {
@@ -4150,6 +6032,21 @@
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "fstream": {
+ "version": "1.0.11",
+ "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+ "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "^4.1.2",
+ "inherits": "~2.0.0",
+ "mkdirp": ">=0.5 0",
+ "rimraf": "2"
+ }
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"function-bind": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -4162,6 +6059,56 @@
"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "gauge": {
+ "version": "2.7.4",
+ "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+ "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+ "dev": true,
+ "requires": {
+ "aproba": "^1.0.3",
+ "console-control-strings": "^1.0.0",
+ "has-unicode": "^2.0.0",
+ "object-assign": "^4.1.0",
+ "signal-exit": "^3.0.0",
+ "string-width": "^1.0.1",
+ "strip-ansi": "^3.0.1",
+ "wide-align": "^1.1.0"
+ },
+ "dependencies": {
+ "is-fullwidth-code-point": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+ "dev": true,
+ "requires": {
+ "number-is-nan": "^1.0.0"
+ }
+ },
+ "string-width": {
+ "version": "1.0.2",
+ "resolved": "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+ "dev": true,
+ "requires": {
+ "code-point-at": "^1.0.0",
+ "is-fullwidth-code-point": "^1.0.0",
+ "strip-ansi": "^3.0.0"
+ }
+ }
+ }
+ },
+ "gaze": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
+ "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
+ "dev": true,
+ "requires": {
+ "globule": "^1.0.0"
+ }
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"get-caller-file": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
@@ -4186,18 +6133,39 @@
"integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "getpass": {
+ "version": "0.1.7",
+ "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+ "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+ "dev": true,
+ "requires": {
+ "assert-plus": "^1.0.0"
+ }
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"glob": {
"version": "7.1.3",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
"integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"fs.realpath": "1.0.0",
"inflight": "1.0.6",
"inherits": "2.0.3",
"minimatch": "3.0.4",
"once": "1.4.0",
"path-is-absolute": "1.0.1"
+=======
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.0.4",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"glob-base": {
@@ -4206,8 +6174,13 @@
"integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"glob-parent": "2.0.0",
"is-glob": "2.0.1"
+=======
+ "glob-parent": "^2.0.0",
+ "is-glob": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"glob-parent": {
@@ -4216,7 +6189,11 @@
"integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-glob": "2.0.1"
+=======
+ "is-glob": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"is-extglob": {
@@ -4231,7 +6208,11 @@
"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-extglob": "1.0.0"
+=======
+ "is-extglob": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -4242,8 +6223,13 @@
"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-glob": "3.1.0",
"path-dirname": "1.0.2"
+=======
+ "is-glob": "^3.1.0",
+ "path-dirname": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"is-glob": {
@@ -4252,7 +6238,11 @@
"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-extglob": "2.1.1"
+=======
+ "is-extglob": "^2.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -4269,12 +6259,32 @@
"integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"array-union": "1.0.2",
"dir-glob": "2.0.0",
"glob": "7.1.3",
"ignore": "3.3.10",
"pify": "3.0.0",
"slash": "1.0.0"
+=======
+ "array-union": "^1.0.1",
+ "dir-glob": "^2.0.0",
+ "glob": "^7.1.2",
+ "ignore": "^3.3.5",
+ "pify": "^3.0.0",
+ "slash": "^1.0.0"
+ }
+ },
+ "globule": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
+ "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
+ "dev": true,
+ "requires": {
+ "glob": "~7.1.1",
+ "lodash": "~4.17.10",
+ "minimatch": "~3.0.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"graceful-fs": {
@@ -4295,8 +6305,13 @@
"integrity": "sha1-iuCWJX6r59acRb4rZ8RIEk/7UXw=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"duplexer": "0.1.1",
"pify": "3.0.0"
+=======
+ "duplexer": "^0.1.1",
+ "pify": "^3.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"handle-thing": {
@@ -4305,13 +6320,62 @@
"integrity": "sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "har-schema": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+ "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+ "dev": true
+ },
+ "har-validator": {
+ "version": "5.1.3",
+ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+ "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+ "dev": true,
+ "requires": {
+ "ajv": "^6.5.5",
+ "har-schema": "^2.0.0"
+ },
+ "dependencies": {
+ "ajv": {
+ "version": "6.6.2",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.2.tgz",
+ "integrity": "sha512-FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g==",
+ "dev": true,
+ "requires": {
+ "fast-deep-equal": "^2.0.1",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.4.1",
+ "uri-js": "^4.2.2"
+ }
+ },
+ "fast-deep-equal": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+ "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+ "dev": true
+ },
+ "json-schema-traverse": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+ "dev": true
+ }
+ }
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"has": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"function-bind": "1.1.1"
+=======
+ "function-bind": "^1.1.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"has-ansi": {
@@ -4320,7 +6384,11 @@
"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-regex": "2.1.1"
+=======
+ "ansi-regex": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"has-flag": {
@@ -4335,15 +6403,30 @@
"integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "has-unicode": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+ "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+ "dev": true
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"has-value": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
"integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"get-value": "2.0.6",
"has-values": "1.0.0",
"isobject": "3.0.1"
+=======
+ "get-value": "^2.0.6",
+ "has-values": "^1.0.0",
+ "isobject": "^3.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"has-values": {
@@ -4352,8 +6435,13 @@
"integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-number": "3.0.0",
"kind-of": "4.0.0"
+=======
+ "is-number": "^3.0.0",
+ "kind-of": "^4.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"kind-of": {
@@ -4362,7 +6450,11 @@
"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-buffer": "1.1.6"
+=======
+ "is-buffer": "^1.1.5"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -4373,8 +6465,13 @@
"integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"inherits": "2.0.3",
"safe-buffer": "5.1.2"
+=======
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"hash-sum": {
@@ -4389,8 +6486,13 @@
"integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"inherits": "2.0.3",
"minimalistic-assert": "1.0.1"
+=======
+ "inherits": "^2.0.3",
+ "minimalistic-assert": "^1.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"he": {
@@ -4405,9 +6507,15 @@
"integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"hash.js": "1.1.7",
"minimalistic-assert": "1.0.1",
"minimalistic-crypto-utils": "1.0.1"
+=======
+ "hash.js": "^1.0.3",
+ "minimalistic-assert": "^1.0.0",
+ "minimalistic-crypto-utils": "^1.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"home-or-tmp": {
@@ -4416,8 +6524,13 @@
"integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"os-homedir": "1.0.2",
"os-tmpdir": "1.0.2"
+=======
+ "os-homedir": "^1.0.0",
+ "os-tmpdir": "^1.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"hosted-git-info": {
@@ -4432,10 +6545,17 @@
"integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"inherits": "2.0.3",
"obuf": "1.1.2",
"readable-stream": "2.3.6",
"wbuf": "1.7.3"
+=======
+ "inherits": "^2.0.1",
+ "obuf": "^1.0.0",
+ "readable-stream": "^2.0.1",
+ "wbuf": "^1.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"html-comment-regex": {
@@ -4456,6 +6576,7 @@
"integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"camel-case": "3.0.0",
"clean-css": "4.2.1",
"commander": "2.17.1",
@@ -4463,6 +6584,15 @@
"param-case": "2.1.1",
"relateurl": "0.2.7",
"uglify-js": "3.4.9"
+=======
+ "camel-case": "3.0.x",
+ "clean-css": "4.2.x",
+ "commander": "2.17.x",
+ "he": "1.2.x",
+ "param-case": "2.1.x",
+ "relateurl": "0.2.x",
+ "uglify-js": "3.4.x"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"html-webpack-plugin": {
@@ -4471,12 +6601,21 @@
"integrity": "sha1-f5xCG36pHsRg9WUn1430hO51N9U=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"bluebird": "3.5.3",
"html-minifier": "3.5.21",
"loader-utils": "0.2.17",
"lodash": "4.17.11",
"pretty-error": "2.1.1",
"toposort": "1.0.7"
+=======
+ "bluebird": "^3.4.7",
+ "html-minifier": "^3.2.3",
+ "loader-utils": "^0.2.16",
+ "lodash": "^4.17.3",
+ "pretty-error": "^2.0.2",
+ "toposort": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"loader-utils": {
@@ -4485,10 +6624,17 @@
"integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"big.js": "3.2.0",
"emojis-list": "2.1.0",
"json5": "0.5.1",
"object-assign": "4.1.1"
+=======
+ "big.js": "^3.1.3",
+ "emojis-list": "^2.0.0",
+ "json5": "^0.5.0",
+ "object-assign": "^4.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -4499,10 +6645,17 @@
"integrity": "sha1-zHDQWln2VC5D8OaFyYLhTJJKnv4=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"domelementtype": "1.3.1",
"domhandler": "2.1.0",
"domutils": "1.1.6",
"readable-stream": "1.0.34"
+=======
+ "domelementtype": "1",
+ "domhandler": "2.1",
+ "domutils": "1.1",
+ "readable-stream": "1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"domutils": {
@@ -4511,7 +6664,11 @@
"integrity": "sha1-vdw94Jm5ou+sxRxiPyj0FuzFdIU=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"domelementtype": "1.3.1"
+=======
+ "domelementtype": "1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"isarray": {
@@ -4526,10 +6683,17 @@
"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"core-util-is": "1.0.2",
"inherits": "2.0.3",
"isarray": "0.0.1",
"string_decoder": "0.10.31"
+=======
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.1",
+ "isarray": "0.0.1",
+ "string_decoder": "~0.10.x"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"string_decoder": {
@@ -4552,10 +6716,17 @@
"integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"depd": "1.1.2",
"inherits": "2.0.3",
"setprototypeof": "1.1.0",
"statuses": "1.4.0"
+=======
+ "depd": "~1.1.2",
+ "inherits": "2.0.3",
+ "setprototypeof": "1.1.0",
+ "statuses": ">= 1.4.0 < 2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"http-parser-js": {
@@ -4570,9 +6741,15 @@
"integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"eventemitter3": "3.1.0",
"follow-redirects": "1.5.10",
"requires-port": "1.0.0"
+=======
+ "eventemitter3": "^3.0.0",
+ "follow-redirects": "^1.0.0",
+ "requires-port": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"http-proxy-middleware": {
@@ -4581,10 +6758,17 @@
"integrity": "sha1-ZC6ISIUdZvCdTxJJEoRtuutBuDM=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"http-proxy": "1.17.0",
"is-glob": "3.1.0",
"lodash": "4.17.11",
"micromatch": "2.3.11"
+=======
+ "http-proxy": "^1.16.2",
+ "is-glob": "^3.1.0",
+ "lodash": "^4.17.2",
+ "micromatch": "^2.3.11"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"arr-diff": {
@@ -4593,7 +6777,11 @@
"integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"arr-flatten": "1.1.0"
+=======
+ "arr-flatten": "^1.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"array-unique": {
@@ -4608,9 +6796,15 @@
"integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"expand-range": "1.8.2",
"preserve": "0.2.0",
"repeat-element": "1.1.3"
+=======
+ "expand-range": "^1.8.1",
+ "preserve": "^0.2.0",
+ "repeat-element": "^1.1.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"expand-brackets": {
@@ -4619,7 +6813,11 @@
"integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-posix-bracket": "0.1.1"
+=======
+ "is-posix-bracket": "^0.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"extglob": {
@@ -4628,7 +6826,11 @@
"integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-extglob": "1.0.0"
+=======
+ "is-extglob": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"is-extglob": {
@@ -4645,7 +6847,11 @@
"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-extglob": "2.1.1"
+=======
+ "is-extglob": "^2.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"micromatch": {
@@ -4654,6 +6860,7 @@
"integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"arr-diff": "2.0.0",
"array-unique": "0.2.1",
"braces": "1.8.5",
@@ -4667,6 +6874,21 @@
"object.omit": "2.0.1",
"parse-glob": "3.0.4",
"regex-cache": "0.4.4"
+=======
+ "arr-diff": "^2.0.0",
+ "array-unique": "^0.2.1",
+ "braces": "^1.8.2",
+ "expand-brackets": "^0.1.4",
+ "extglob": "^0.3.1",
+ "filename-regex": "^2.0.0",
+ "is-extglob": "^1.0.0",
+ "is-glob": "^2.0.1",
+ "kind-of": "^3.0.2",
+ "normalize-path": "^2.0.1",
+ "object.omit": "^2.0.0",
+ "parse-glob": "^3.0.4",
+ "regex-cache": "^0.4.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"is-extglob": {
@@ -4681,13 +6903,31 @@
"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-extglob": "1.0.0"
+=======
+ "is-extglob": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
}
}
},
+<<<<<<< HEAD
+=======
+ "http-signature": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+ "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+ "dev": true,
+ "requires": {
+ "assert-plus": "^1.0.0",
+ "jsprim": "^1.2.2",
+ "sshpk": "^1.7.0"
+ }
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"https-browserify": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
@@ -4700,7 +6940,11 @@
"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"safer-buffer": "2.1.2"
+=======
+ "safer-buffer": ">= 2.1.2 < 3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"icss-replace-symbols": {
@@ -4715,7 +6959,11 @@
"integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"postcss": "6.0.23"
+=======
+ "postcss": "^6.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"ieee754": {
@@ -4742,7 +6990,11 @@
"integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"import-from": "2.1.0"
+=======
+ "import-from": "^2.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"import-from": {
@@ -4751,7 +7003,11 @@
"integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"resolve-from": "3.0.0"
+=======
+ "resolve-from": "^3.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"resolve-from": {
@@ -4768,8 +7024,13 @@
"integrity": "sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"pkg-dir": "2.0.0",
"resolve-cwd": "2.0.0"
+=======
+ "pkg-dir": "^2.0.0",
+ "resolve-cwd": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"imurmurhash": {
@@ -4778,13 +7039,26 @@
"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "in-publish": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
+ "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
+ "dev": true
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"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": {
+<<<<<<< HEAD
"repeating": "2.0.1"
+=======
+ "repeating": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"indexes-of": {
@@ -4805,8 +7079,13 @@
"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"once": "1.4.0",
"wrappy": "1.0.2"
+=======
+ "once": "^1.3.0",
+ "wrappy": "1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"inherits": {
@@ -4821,6 +7100,7 @@
"integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-escapes": "3.1.0",
"chalk": "2.4.1",
"cli-cursor": "2.1.0",
@@ -4835,6 +7115,22 @@
"string-width": "2.1.1",
"strip-ansi": "4.0.0",
"through": "2.3.8"
+=======
+ "ansi-escapes": "^3.0.0",
+ "chalk": "^2.0.0",
+ "cli-cursor": "^2.1.0",
+ "cli-width": "^2.0.0",
+ "external-editor": "^2.0.4",
+ "figures": "^2.0.0",
+ "lodash": "^4.3.0",
+ "mute-stream": "0.0.7",
+ "run-async": "^2.2.0",
+ "rx-lite": "^4.0.8",
+ "rx-lite-aggregates": "^4.0.8",
+ "string-width": "^2.1.0",
+ "strip-ansi": "^4.0.0",
+ "through": "^2.3.6"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-regex": {
@@ -4849,7 +7145,11 @@
"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-regex": "3.0.0"
+=======
+ "ansi-regex": "^3.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -4860,7 +7160,11 @@
"integrity": "sha1-rp+/k7mEh4eF1QqN4bNWlWBYz1w=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"meow": "3.7.0"
+=======
+ "meow": "^3.3.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"interpret": {
@@ -4875,7 +7179,11 @@
"integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"loose-envify": "1.4.0"
+=======
+ "loose-envify": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"invert-kv": {
@@ -4908,7 +7216,11 @@
"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"kind-of": "3.2.2"
+=======
+ "kind-of": "^3.0.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"is-arrayish": {
@@ -4923,7 +7235,11 @@
"integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"binary-extensions": "1.12.0"
+=======
+ "binary-extensions": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"is-buffer": {
@@ -4938,7 +7254,11 @@
"integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"builtin-modules": "1.1.1"
+=======
+ "builtin-modules": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"is-callable": {
@@ -4953,7 +7273,11 @@
"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"kind-of": "3.2.2"
+=======
+ "kind-of": "^3.0.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"is-date-object": {
@@ -4968,9 +7292,15 @@
"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-accessor-descriptor": "0.1.6",
"is-data-descriptor": "0.1.4",
"kind-of": "5.1.0"
+=======
+ "is-accessor-descriptor": "^0.1.6",
+ "is-data-descriptor": "^0.1.4",
+ "kind-of": "^5.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"kind-of": {
@@ -4999,7 +7329,11 @@
"integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-primitive": "2.0.0"
+=======
+ "is-primitive": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"is-extendable": {
@@ -5020,7 +7354,11 @@
"integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"number-is-nan": "1.0.1"
+=======
+ "number-is-nan": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"is-fullwidth-code-point": {
@@ -5035,7 +7373,11 @@
"integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-extglob": "2.1.1"
+=======
+ "is-extglob": "^2.1.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"is-number": {
@@ -5044,7 +7386,11 @@
"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"kind-of": "3.2.2"
+=======
+ "kind-of": "^3.0.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"is-path-cwd": {
@@ -5059,7 +7405,11 @@
"integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-path-inside": "1.0.1"
+=======
+ "is-path-inside": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"is-path-inside": {
@@ -5068,7 +7418,11 @@
"integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"path-is-inside": "1.0.2"
+=======
+ "path-is-inside": "^1.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"is-plain-obj": {
@@ -5083,7 +7437,11 @@
"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"isobject": "3.0.1"
+=======
+ "isobject": "^3.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"is-posix-bracket": {
@@ -5110,7 +7468,11 @@
"integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has": "1.0.3"
+=======
+ "has": "^1.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"is-resolvable": {
@@ -5131,7 +7493,11 @@
"integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"html-comment-regex": "1.1.2"
+=======
+ "html-comment-regex": "^1.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"is-symbol": {
@@ -5140,9 +7506,21 @@
"integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-symbols": "1.0.0"
}
},
+=======
+ "has-symbols": "^1.0.0"
+ }
+ },
+ "is-typedarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+ "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+ "dev": true
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"is-utf8": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
@@ -5179,6 +7557,15 @@
"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "isstream": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+ "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+ "dev": true
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"js-base64": {
"version": "2.4.9",
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.9.tgz",
@@ -5197,10 +7584,23 @@
"integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"argparse": "1.0.10",
"esprima": "2.7.3"
}
},
+=======
+ "argparse": "^1.0.7",
+ "esprima": "^2.6.0"
+ }
+ },
+ "jsbn": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+ "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+ "dev": true
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"jsesc": {
"version": "1.3.0",
"resolved": "http://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
@@ -5219,6 +7619,15 @@
"integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "json-schema": {
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+ "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+ "dev": true
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"json-schema-traverse": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
@@ -5231,6 +7640,15 @@
"integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "json-stringify-safe": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+ "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+ "dev": true
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"json3": {
"version": "3.3.2",
"resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
@@ -5243,6 +7661,21 @@
"integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "jsprim": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+ "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+ "dev": true,
+ "requires": {
+ "assert-plus": "1.0.0",
+ "extsprintf": "1.3.0",
+ "json-schema": "0.2.3",
+ "verror": "1.10.0"
+ }
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"killable": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
@@ -5255,7 +7688,11 @@
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-buffer": "1.1.6"
+=======
+ "is-buffer": "^1.1.5"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"last-call-webpack-plugin": {
@@ -5264,8 +7701,13 @@
"integrity": "sha512-CZc+m2xZm51J8qSwdODeiiNeqh8CYkKEq6Rw8IkE4i/4yqf2cJhjQPsA6BtAV970ePRNhwEOXhy2U5xc5Jwh9Q==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"lodash": "4.17.11",
"webpack-sources": "1.3.0"
+=======
+ "lodash": "^4.17.4",
+ "webpack-sources": "^1.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"lazy-cache": {
@@ -5280,7 +7722,11 @@
"integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"invert-kv": "1.0.0"
+=======
+ "invert-kv": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"levn": {
@@ -5289,8 +7735,13 @@
"integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"prelude-ls": "1.1.2",
"type-check": "0.3.2"
+=======
+ "prelude-ls": "~1.1.2",
+ "type-check": "~0.3.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"load-json-file": {
@@ -5299,10 +7750,17 @@
"integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"graceful-fs": "4.1.15",
"parse-json": "2.2.0",
"pify": "2.3.0",
"strip-bom": "3.0.0"
+=======
+ "graceful-fs": "^4.1.2",
+ "parse-json": "^2.2.0",
+ "pify": "^2.0.0",
+ "strip-bom": "^3.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"pify": {
@@ -5319,7 +7777,11 @@
"integrity": "sha1-VuC/CL2XCLJqdltoUJhAyN7J/bw=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"find-cache-dir": "0.1.1",
+=======
+ "find-cache-dir": "^0.1.1",
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"mkdirp": "0.5.1"
},
"dependencies": {
@@ -5329,9 +7791,15 @@
"integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"commondir": "1.0.1",
"mkdirp": "0.5.1",
"pkg-dir": "1.0.0"
+=======
+ "commondir": "^1.0.1",
+ "mkdirp": "^0.5.1",
+ "pkg-dir": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"find-up": {
@@ -5340,8 +7808,13 @@
"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"path-exists": "2.1.0",
"pinkie-promise": "2.0.1"
+=======
+ "path-exists": "^2.0.0",
+ "pinkie-promise": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"path-exists": {
@@ -5350,7 +7823,11 @@
"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"pinkie-promise": "2.0.1"
+=======
+ "pinkie-promise": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"pkg-dir": {
@@ -5359,7 +7836,11 @@
"integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"find-up": "1.1.2"
+=======
+ "find-up": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -5376,9 +7857,15 @@
"integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"big.js": "3.2.0",
"emojis-list": "2.1.0",
"json5": "0.5.1"
+=======
+ "big.js": "^3.1.3",
+ "emojis-list": "^2.0.0",
+ "json5": "^0.5.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"locate-path": {
@@ -5387,8 +7874,13 @@
"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"p-locate": "2.0.0",
"path-exists": "3.0.0"
+=======
+ "p-locate": "^2.0.0",
+ "path-exists": "^3.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"lodash": {
@@ -5397,12 +7889,30 @@
"integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "lodash.assign": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
+ "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
+ "dev": true
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"lodash.camelcase": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
"integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "lodash.clonedeep": {
+ "version": "4.5.0",
+ "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+ "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+ "dev": true
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"lodash.debounce": {
"version": "4.0.8",
"resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
@@ -5415,6 +7925,21 @@
"integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "lodash.mergewith": {
+ "version": "4.6.1",
+ "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
+ "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==",
+ "dev": true
+ },
+ "lodash.tail": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz",
+ "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=",
+ "dev": true
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"lodash.uniq": {
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
@@ -5427,7 +7952,11 @@
"integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "2.4.1"
+=======
+ "chalk": "^2.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"loglevel": {
@@ -5448,7 +7977,11 @@
"integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"js-tokens": "3.0.2"
+=======
+ "js-tokens": "^3.0.0 || ^4.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"loud-rejection": {
@@ -5457,8 +7990,13 @@
"integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"currently-unhandled": "0.4.1",
"signal-exit": "3.0.2"
+=======
+ "currently-unhandled": "^0.4.1",
+ "signal-exit": "^3.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"lower-case": {
@@ -5473,8 +8011,13 @@
"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"pseudomap": "1.0.2",
"yallist": "2.1.2"
+=======
+ "pseudomap": "^1.0.2",
+ "yallist": "^2.1.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"make-dir": {
@@ -5483,7 +8026,11 @@
"integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"pify": "3.0.0"
+=======
+ "pify": "^3.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"map-cache": {
@@ -5504,7 +8051,11 @@
"integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"object-visit": "1.0.1"
+=======
+ "object-visit": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"math-expression-evaluator": {
@@ -5525,9 +8076,15 @@
"integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"hash-base": "3.0.4",
"inherits": "2.0.3",
"safe-buffer": "5.1.2"
+=======
+ "hash-base": "^3.0.0",
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.1.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"media-typer": {
@@ -5542,7 +8099,11 @@
"integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"mimic-fn": "1.2.0"
+=======
+ "mimic-fn": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"memory-fs": {
@@ -5551,8 +8112,13 @@
"integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"errno": "0.1.7",
"readable-stream": "2.3.6"
+=======
+ "errno": "^0.1.3",
+ "readable-stream": "^2.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"meow": {
@@ -5561,6 +8127,7 @@
"integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"camelcase-keys": "2.1.0",
"decamelize": "1.2.0",
"loud-rejection": "1.6.0",
@@ -5571,6 +8138,18 @@
"read-pkg-up": "1.0.1",
"redent": "1.0.0",
"trim-newlines": "1.0.0"
+=======
+ "camelcase-keys": "^2.0.0",
+ "decamelize": "^1.1.2",
+ "loud-rejection": "^1.0.0",
+ "map-obj": "^1.0.1",
+ "minimist": "^1.1.3",
+ "normalize-package-data": "^2.3.4",
+ "object-assign": "^4.0.1",
+ "read-pkg-up": "^1.0.1",
+ "redent": "^1.0.0",
+ "trim-newlines": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"find-up": {
@@ -5579,8 +8158,13 @@
"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"path-exists": "2.1.0",
"pinkie-promise": "2.0.1"
+=======
+ "path-exists": "^2.0.0",
+ "pinkie-promise": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"load-json-file": {
@@ -5589,11 +8173,19 @@
"integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"graceful-fs": "4.1.15",
"parse-json": "2.2.0",
"pify": "2.3.0",
"pinkie-promise": "2.0.1",
"strip-bom": "2.0.0"
+=======
+ "graceful-fs": "^4.1.2",
+ "parse-json": "^2.2.0",
+ "pify": "^2.0.0",
+ "pinkie-promise": "^2.0.0",
+ "strip-bom": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"minimist": {
@@ -5608,7 +8200,11 @@
"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"pinkie-promise": "2.0.1"
+=======
+ "pinkie-promise": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"path-type": {
@@ -5617,9 +8213,15 @@
"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"graceful-fs": "4.1.15",
"pify": "2.3.0",
"pinkie-promise": "2.0.1"
+=======
+ "graceful-fs": "^4.1.2",
+ "pify": "^2.0.0",
+ "pinkie-promise": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"pify": {
@@ -5634,9 +8236,15 @@
"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"load-json-file": "1.1.0",
"normalize-package-data": "2.4.0",
"path-type": "1.1.0"
+=======
+ "load-json-file": "^1.0.0",
+ "normalize-package-data": "^2.3.2",
+ "path-type": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"read-pkg-up": {
@@ -5645,8 +8253,13 @@
"integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"find-up": "1.1.2",
"read-pkg": "1.1.0"
+=======
+ "find-up": "^1.0.0",
+ "read-pkg": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"strip-bom": {
@@ -5655,7 +8268,11 @@
"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-utf8": "0.2.1"
+=======
+ "is-utf8": "^0.2.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -5678,6 +8295,7 @@
"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"arr-diff": "4.0.0",
"array-unique": "0.3.2",
"braces": "2.3.2",
@@ -5691,6 +8309,21 @@
"regex-not": "1.0.2",
"snapdragon": "0.8.2",
"to-regex": "3.0.2"
+=======
+ "arr-diff": "^4.0.0",
+ "array-unique": "^0.3.2",
+ "braces": "^2.3.1",
+ "define-property": "^2.0.2",
+ "extend-shallow": "^3.0.2",
+ "extglob": "^2.0.4",
+ "fragment-cache": "^0.2.1",
+ "kind-of": "^6.0.2",
+ "nanomatch": "^1.2.9",
+ "object.pick": "^1.3.0",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"kind-of": {
@@ -5707,8 +8340,13 @@
"integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"bn.js": "4.11.8",
"brorand": "1.1.0"
+=======
+ "bn.js": "^4.0.0",
+ "brorand": "^1.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"mime": {
@@ -5729,7 +8367,11 @@
"integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"mime-db": "1.37.0"
+=======
+ "mime-db": "~1.37.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"mimic-fn": {
@@ -5756,7 +8398,11 @@
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"brace-expansion": "1.1.11"
+=======
+ "brace-expansion": "^1.1.7"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"minimist": {
@@ -5765,12 +8411,26 @@
"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "mint-ui": {
+ "version": "2.2.13",
+ "resolved": "https://registry.npmjs.org/mint-ui/-/mint-ui-2.2.13.tgz",
+ "integrity": "sha512-Xz1SFagHSzKOprwQv3fcekXT5RJvhh939zwZHcWeazk1OJrCjsD4I2qm49AEUCfT1AoYzC+rsZIwGP/J6LwVVw==",
+ "requires": {
+ "array-find-index": "^1.0.2",
+ "raf.js": "0.0.4",
+ "vue-lazyload": "^1.0.1"
+ }
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"mississippi": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz",
"integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"concat-stream": "1.6.2",
"duplexify": "3.6.1",
"end-of-stream": "1.4.1",
@@ -5781,6 +8441,18 @@
"pumpify": "1.5.1",
"stream-each": "1.2.3",
"through2": "2.0.5"
+=======
+ "concat-stream": "^1.5.0",
+ "duplexify": "^3.4.2",
+ "end-of-stream": "^1.1.0",
+ "flush-write-stream": "^1.0.0",
+ "from2": "^2.1.0",
+ "parallel-transform": "^1.1.0",
+ "pump": "^2.0.1",
+ "pumpify": "^1.3.3",
+ "stream-each": "^1.1.0",
+ "through2": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"mixin-deep": {
@@ -5789,8 +8461,13 @@
"integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"for-in": "1.0.2",
"is-extendable": "1.0.1"
+=======
+ "for-in": "^1.0.2",
+ "is-extendable": "^1.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"is-extendable": {
@@ -5799,11 +8476,36 @@
"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-plain-object": "2.0.4"
+=======
+ "is-plain-object": "^2.0.4"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
},
+<<<<<<< HEAD
+=======
+ "mixin-object": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
+ "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
+ "dev": true,
+ "requires": {
+ "for-in": "^0.1.3",
+ "is-extendable": "^0.1.1"
+ },
+ "dependencies": {
+ "for-in": {
+ "version": "0.1.8",
+ "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
+ "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=",
+ "dev": true
+ }
+ }
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"mkdirp": {
"version": "0.5.1",
"resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
@@ -5819,12 +8521,21 @@
"integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"aproba": "1.2.0",
"copy-concurrently": "1.0.5",
"fs-write-stream-atomic": "1.0.10",
"mkdirp": "0.5.1",
"rimraf": "2.6.2",
"run-queue": "1.0.3"
+=======
+ "aproba": "^1.1.1",
+ "copy-concurrently": "^1.0.0",
+ "fs-write-stream-atomic": "^1.0.8",
+ "mkdirp": "^0.5.1",
+ "rimraf": "^2.5.4",
+ "run-queue": "^1.0.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"ms": {
@@ -5839,8 +8550,13 @@
"integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"dns-packet": "1.3.1",
"thunky": "1.0.3"
+=======
+ "dns-packet": "^1.3.1",
+ "thunky": "^1.0.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"multicast-dns-service-types": {
@@ -5855,12 +8571,22 @@
"integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "nan": {
+ "version": "2.12.1",
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz",
+ "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==",
+ "dev": true
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"nanomatch": {
"version": "1.2.13",
"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"arr-diff": "4.0.0",
"array-unique": "0.3.2",
"define-property": "2.0.2",
@@ -5872,6 +8598,19 @@
"regex-not": "1.0.2",
"snapdragon": "0.8.2",
"to-regex": "3.0.2"
+=======
+ "arr-diff": "^4.0.0",
+ "array-unique": "^0.3.2",
+ "define-property": "^2.0.2",
+ "extend-shallow": "^3.0.2",
+ "fragment-cache": "^0.2.1",
+ "is-windows": "^1.0.2",
+ "kind-of": "^6.0.2",
+ "object.pick": "^1.3.0",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"kind-of": {
@@ -5912,7 +8651,11 @@
"integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"lower-case": "1.1.4"
+=======
+ "lower-case": "^1.1.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"node-forge": {
@@ -5921,6 +8664,7 @@
"integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==",
"dev": true
},
+<<<<<<< HEAD
"node-libs-browser": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz",
@@ -5949,11 +8693,69 @@
"tty-browserify": "0.0.0",
"url": "0.11.0",
"util": "0.10.4",
- "vm-browserify": "0.0.4"
+=======
+ "node-gyp": {
+ "version": "3.8.0",
+ "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
+ "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
+ "dev": true,
+ "requires": {
+ "fstream": "^1.0.0",
+ "glob": "^7.0.3",
+ "graceful-fs": "^4.1.2",
+ "mkdirp": "^0.5.0",
+ "nopt": "2 || 3",
+ "npmlog": "0 || 1 || 2 || 3 || 4",
+ "osenv": "0",
+ "request": "^2.87.0",
+ "rimraf": "2",
+ "semver": "~5.3.0",
+ "tar": "^2.0.0",
+ "which": "1"
},
"dependencies": {
- "punycode": {
- "version": "1.4.1",
+ "semver": {
+ "version": "5.3.0",
+ "resolved": "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+ "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+ "dev": true
+ }
+ }
+ },
+ "node-libs-browser": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz",
+ "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==",
+ "dev": true,
+ "requires": {
+ "assert": "^1.1.1",
+ "browserify-zlib": "^0.2.0",
+ "buffer": "^4.3.0",
+ "console-browserify": "^1.1.0",
+ "constants-browserify": "^1.0.0",
+ "crypto-browserify": "^3.11.0",
+ "domain-browser": "^1.1.1",
+ "events": "^1.0.0",
+ "https-browserify": "^1.0.0",
+ "os-browserify": "^0.3.0",
+ "path-browserify": "0.0.0",
+ "process": "^0.11.10",
+ "punycode": "^1.2.4",
+ "querystring-es3": "^0.2.0",
+ "readable-stream": "^2.3.3",
+ "stream-browserify": "^2.0.1",
+ "stream-http": "^2.7.2",
+ "string_decoder": "^1.0.0",
+ "timers-browserify": "^2.0.4",
+ "tty-browserify": "0.0.0",
+ "url": "^0.11.0",
+ "util": "^0.10.3",
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
+ "vm-browserify": "0.0.4"
+ },
+ "dependencies": {
+ "punycode": {
+ "version": "1.4.1",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
"integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
"dev": true
@@ -5966,10 +8768,90 @@
"integrity": "sha512-AhENzCSGZnZJgBARsUjnQ7DnZbzyP+HxlVXuD0xqAnvL8q+OqtSX7lGg9e8nHzwXkMMXNdVeqq4E2M3EUAqX6Q==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"growly": "1.3.0",
"semver": "5.6.0",
"shellwords": "0.1.1",
"which": "1.3.1"
+=======
+ "growly": "^1.3.0",
+ "semver": "^5.5.0",
+ "shellwords": "^0.1.1",
+ "which": "^1.3.0"
+ }
+ },
+ "node-sass": {
+ "version": "4.11.0",
+ "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.11.0.tgz",
+ "integrity": "sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==",
+ "dev": true,
+ "requires": {
+ "async-foreach": "^0.1.3",
+ "chalk": "^1.1.1",
+ "cross-spawn": "^3.0.0",
+ "gaze": "^1.0.0",
+ "get-stdin": "^4.0.1",
+ "glob": "^7.0.3",
+ "in-publish": "^2.0.0",
+ "lodash.assign": "^4.2.0",
+ "lodash.clonedeep": "^4.3.2",
+ "lodash.mergewith": "^4.6.0",
+ "meow": "^3.7.0",
+ "mkdirp": "^0.5.1",
+ "nan": "^2.10.0",
+ "node-gyp": "^3.8.0",
+ "npmlog": "^4.0.0",
+ "request": "^2.88.0",
+ "sass-graph": "^2.2.4",
+ "stdout-stream": "^1.4.0",
+ "true-case-path": "^1.0.2"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+ "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+ "dev": true
+ },
+ "chalk": {
+ "version": "1.1.3",
+ "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+ }
+ },
+ "cross-spawn": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
+ "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
+ "dev": true,
+ "requires": {
+ "lru-cache": "^4.0.1",
+ "which": "^1.2.9"
+ }
+ },
+ "supports-color": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+ "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+ "dev": true
+ }
+ }
+ },
+ "nopt": {
+ "version": "3.0.6",
+ "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+ "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+ "dev": true,
+ "requires": {
+ "abbrev": "1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"normalize-package-data": {
@@ -5978,10 +8860,17 @@
"integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"hosted-git-info": "2.7.1",
"is-builtin-module": "1.0.0",
"semver": "5.6.0",
"validate-npm-package-license": "3.0.4"
+=======
+ "hosted-git-info": "^2.1.4",
+ "is-builtin-module": "^1.0.0",
+ "semver": "2 || 3 || 4 || 5",
+ "validate-npm-package-license": "^3.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"normalize-path": {
@@ -5990,7 +8879,11 @@
"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"remove-trailing-separator": "1.1.0"
+=======
+ "remove-trailing-separator": "^1.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"normalize-range": {
@@ -6005,10 +8898,17 @@
"integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"object-assign": "4.1.1",
"prepend-http": "1.0.4",
"query-string": "4.3.4",
"sort-keys": "1.1.2"
+=======
+ "object-assign": "^4.0.1",
+ "prepend-http": "^1.0.0",
+ "query-string": "^4.1.0",
+ "sort-keys": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"npm-run-path": {
@@ -6017,7 +8917,23 @@
"integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"path-key": "2.0.1"
+=======
+ "path-key": "^2.0.0"
+ }
+ },
+ "npmlog": {
+ "version": "4.1.2",
+ "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+ "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+ "dev": true,
+ "requires": {
+ "are-we-there-yet": "~1.1.2",
+ "console-control-strings": "~1.1.0",
+ "gauge": "~2.7.3",
+ "set-blocking": "~2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"nth-check": {
@@ -6026,7 +8942,11 @@
"integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"boolbase": "1.0.0"
+=======
+ "boolbase": "~1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"num2fraction": {
@@ -6041,6 +8961,15 @@
"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "oauth-sign": {
+ "version": "0.9.0",
+ "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+ "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+ "dev": true
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"object-assign": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -6053,9 +8982,15 @@
"integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"copy-descriptor": "0.1.1",
"define-property": "0.2.5",
"kind-of": "3.2.2"
+=======
+ "copy-descriptor": "^0.1.0",
+ "define-property": "^0.2.5",
+ "kind-of": "^3.0.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"define-property": {
@@ -6064,7 +8999,11 @@
"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-descriptor": "0.1.6"
+=======
+ "is-descriptor": "^0.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -6087,7 +9026,11 @@
"integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"isobject": "3.0.1"
+=======
+ "isobject": "^3.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"object.omit": {
@@ -6096,8 +9039,13 @@
"integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"for-own": "0.1.5",
"is-extendable": "0.1.1"
+=======
+ "for-own": "^0.1.4",
+ "is-extendable": "^0.1.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"object.pick": {
@@ -6106,7 +9054,11 @@
"integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"isobject": "3.0.1"
+=======
+ "isobject": "^3.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"obuf": {
@@ -6136,7 +9088,11 @@
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"wrappy": "1.0.2"
+=======
+ "wrappy": "1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"onetime": {
@@ -6145,7 +9101,11 @@
"integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"mimic-fn": "1.2.0"
+=======
+ "mimic-fn": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"opener": {
@@ -6160,7 +9120,11 @@
"integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-wsl": "1.1.0"
+=======
+ "is-wsl": "^1.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"optimize-css-assets-webpack-plugin": {
@@ -6169,8 +9133,13 @@
"integrity": "sha512-Fjn7wyyadPAriuH2DHamDQw5B8GohEWbroBkKoPeP+vSF2PIAPI7WDihi8WieMRb/At4q7Ea7zTKaMDuSoIAAg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"cssnano": "3.10.0",
"last-call-webpack-plugin": "2.1.2"
+=======
+ "cssnano": "^3.4.0",
+ "last-call-webpack-plugin": "^2.1.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"optionator": {
@@ -6179,12 +9148,21 @@
"integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"deep-is": "0.1.3",
"fast-levenshtein": "2.0.6",
"levn": "0.3.0",
"prelude-ls": "1.1.2",
"type-check": "0.3.2",
"wordwrap": "1.0.0"
+=======
+ "deep-is": "~0.1.3",
+ "fast-levenshtein": "~2.0.4",
+ "levn": "~0.3.0",
+ "prelude-ls": "~1.1.2",
+ "type-check": "~0.3.2",
+ "wordwrap": "~1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"ora": {
@@ -6193,10 +9171,17 @@
"integrity": "sha512-iMK1DOQxzzh2MBlVsU42G80mnrvUhqsMh74phHtDlrcTZPK0pH6o7l7DRshK+0YsxDyEuaOkziVdvM3T0QTzpw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "2.4.1",
"cli-cursor": "2.1.0",
"cli-spinners": "1.3.1",
"log-symbols": "2.2.0"
+=======
+ "chalk": "^2.1.0",
+ "cli-cursor": "^2.1.0",
+ "cli-spinners": "^1.0.1",
+ "log-symbols": "^2.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"original": {
@@ -6205,7 +9190,11 @@
"integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"url-parse": "1.4.4"
+=======
+ "url-parse": "^1.4.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"os-browserify": {
@@ -6226,9 +9215,15 @@
"integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"execa": "0.7.0",
"lcid": "1.0.0",
"mem": "1.1.0"
+=======
+ "execa": "^0.7.0",
+ "lcid": "^1.0.0",
+ "mem": "^1.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"os-tmpdir": {
@@ -6237,6 +9232,19 @@
"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "osenv": {
+ "version": "0.1.5",
+ "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+ "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+ "dev": true,
+ "requires": {
+ "os-homedir": "^1.0.0",
+ "os-tmpdir": "^1.0.0"
+ }
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"p-finally": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
@@ -6249,7 +9257,11 @@
"integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"p-try": "1.0.0"
+=======
+ "p-try": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"p-locate": {
@@ -6258,7 +9270,11 @@
"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"p-limit": "1.3.0"
+=======
+ "p-limit": "^1.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"p-map": {
@@ -6285,9 +9301,15 @@
"integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"cyclist": "0.2.2",
"inherits": "2.0.3",
"readable-stream": "2.3.6"
+=======
+ "cyclist": "~0.2.2",
+ "inherits": "^2.0.3",
+ "readable-stream": "^2.1.5"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"param-case": {
@@ -6296,7 +9318,11 @@
"integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"no-case": "2.3.2"
+=======
+ "no-case": "^2.2.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"parse-asn1": {
@@ -6305,11 +9331,19 @@
"integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"asn1.js": "4.10.1",
"browserify-aes": "1.2.0",
"create-hash": "1.2.0",
"evp_bytestokey": "1.0.3",
"pbkdf2": "3.0.17"
+=======
+ "asn1.js": "^4.0.0",
+ "browserify-aes": "^1.0.0",
+ "create-hash": "^1.1.0",
+ "evp_bytestokey": "^1.0.0",
+ "pbkdf2": "^3.0.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"parse-glob": {
@@ -6318,10 +9352,17 @@
"integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"glob-base": "0.3.0",
"is-dotfile": "1.0.3",
"is-extglob": "1.0.0",
"is-glob": "2.0.1"
+=======
+ "glob-base": "^0.3.0",
+ "is-dotfile": "^1.0.0",
+ "is-extglob": "^1.0.0",
+ "is-glob": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"is-extglob": {
@@ -6336,7 +9377,11 @@
"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-extglob": "1.0.0"
+=======
+ "is-extglob": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -6347,7 +9392,11 @@
"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"error-ex": "1.3.2"
+=======
+ "error-ex": "^1.2.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"parseurl": {
@@ -6416,7 +9465,11 @@
"integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"pify": "3.0.0"
+=======
+ "pify": "^3.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"pbkdf2": {
@@ -6425,6 +9478,7 @@
"integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"create-hash": "1.2.0",
"create-hmac": "1.1.7",
"ripemd160": "2.0.2",
@@ -6432,6 +9486,21 @@
"sha.js": "2.4.11"
}
},
+=======
+ "create-hash": "^1.1.2",
+ "create-hmac": "^1.1.4",
+ "ripemd160": "^2.0.1",
+ "safe-buffer": "^5.0.1",
+ "sha.js": "^2.4.8"
+ }
+ },
+ "performance-now": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+ "dev": true
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"pify": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
@@ -6450,7 +9519,11 @@
"integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"pinkie": "2.0.4"
+=======
+ "pinkie": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"pkg-dir": {
@@ -6459,7 +9532,11 @@
"integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"find-up": "2.1.0"
+=======
+ "find-up": "^2.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"pluralize": {
@@ -6474,9 +9551,15 @@
"integrity": "sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"async": "1.5.2",
"debug": "2.6.9",
"mkdirp": "0.5.1"
+=======
+ "async": "^1.5.2",
+ "debug": "^2.2.0",
+ "mkdirp": "0.5.x"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"async": {
@@ -6499,9 +9582,15 @@
"integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "2.4.1",
"source-map": "0.6.1",
"supports-color": "5.5.0"
+=======
+ "chalk": "^2.4.1",
+ "source-map": "^0.6.1",
+ "supports-color": "^5.4.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"postcss-calc": {
@@ -6510,9 +9599,15 @@
"integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"postcss": "5.2.18",
"postcss-message-helpers": "2.0.0",
"reduce-css-calc": "1.3.0"
+=======
+ "postcss": "^5.0.2",
+ "postcss-message-helpers": "^2.0.0",
+ "reduce-css-calc": "^1.2.6"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -6527,11 +9622,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"supports-color": {
@@ -6554,10 +9657,17 @@
"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"js-base64": "2.4.9",
"source-map": "0.5.7",
"supports-color": "3.2.3"
+=======
+ "chalk": "^1.1.3",
+ "js-base64": "^2.1.9",
+ "source-map": "^0.5.6",
+ "supports-color": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map": {
@@ -6572,7 +9682,11 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "1.0.0"
+=======
+ "has-flag": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -6583,9 +9697,15 @@
"integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"colormin": "1.1.2",
"postcss": "5.2.18",
"postcss-value-parser": "3.3.1"
+=======
+ "colormin": "^1.0.5",
+ "postcss": "^5.0.13",
+ "postcss-value-parser": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -6600,11 +9720,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"supports-color": {
@@ -6627,10 +9755,17 @@
"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"js-base64": "2.4.9",
"source-map": "0.5.7",
"supports-color": "3.2.3"
+=======
+ "chalk": "^1.1.3",
+ "js-base64": "^2.1.9",
+ "source-map": "^0.5.6",
+ "supports-color": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map": {
@@ -6645,7 +9780,11 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "1.0.0"
+=======
+ "has-flag": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -6656,8 +9795,13 @@
"integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"postcss": "5.2.18",
"postcss-value-parser": "3.3.1"
+=======
+ "postcss": "^5.0.11",
+ "postcss-value-parser": "^3.1.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -6672,11 +9816,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"supports-color": {
@@ -6699,10 +9851,17 @@
"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"js-base64": "2.4.9",
"source-map": "0.5.7",
"supports-color": "3.2.3"
+=======
+ "chalk": "^1.1.3",
+ "js-base64": "^2.1.9",
+ "source-map": "^0.5.6",
+ "supports-color": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map": {
@@ -6717,7 +9876,11 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "1.0.0"
+=======
+ "has-flag": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -6728,7 +9891,11 @@
"integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"postcss": "5.2.18"
+=======
+ "postcss": "^5.0.14"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -6743,11 +9910,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"supports-color": {
@@ -6770,10 +9945,17 @@
"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"js-base64": "2.4.9",
"source-map": "0.5.7",
"supports-color": "3.2.3"
+=======
+ "chalk": "^1.1.3",
+ "js-base64": "^2.1.9",
+ "source-map": "^0.5.6",
+ "supports-color": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map": {
@@ -6788,7 +9970,11 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "1.0.0"
+=======
+ "has-flag": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -6799,7 +9985,11 @@
"integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"postcss": "5.2.18"
+=======
+ "postcss": "^5.0.4"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -6814,11 +10004,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"supports-color": {
@@ -6841,10 +10039,17 @@
"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"js-base64": "2.4.9",
"source-map": "0.5.7",
"supports-color": "3.2.3"
+=======
+ "chalk": "^1.1.3",
+ "js-base64": "^2.1.9",
+ "source-map": "^0.5.6",
+ "supports-color": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map": {
@@ -6859,7 +10064,11 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "1.0.0"
+=======
+ "has-flag": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -6870,7 +10079,11 @@
"integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"postcss": "5.2.18"
+=======
+ "postcss": "^5.0.14"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -6885,11 +10098,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"supports-color": {
@@ -6912,10 +10133,17 @@
"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"js-base64": "2.4.9",
"source-map": "0.5.7",
"supports-color": "3.2.3"
+=======
+ "chalk": "^1.1.3",
+ "js-base64": "^2.1.9",
+ "source-map": "^0.5.6",
+ "supports-color": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map": {
@@ -6930,7 +10158,11 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "1.0.0"
+=======
+ "has-flag": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -6941,7 +10173,11 @@
"integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"postcss": "5.2.18"
+=======
+ "postcss": "^5.0.16"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -6956,11 +10192,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"supports-color": {
@@ -6983,10 +10227,17 @@
"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"js-base64": "2.4.9",
"source-map": "0.5.7",
"supports-color": "3.2.3"
+=======
+ "chalk": "^1.1.3",
+ "js-base64": "^2.1.9",
+ "source-map": "^0.5.6",
+ "supports-color": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map": {
@@ -7001,7 +10252,11 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "1.0.0"
+=======
+ "has-flag": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -7012,8 +10267,13 @@
"integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"postcss": "5.2.18",
"uniqs": "2.0.0"
+=======
+ "postcss": "^5.0.14",
+ "uniqs": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -7028,11 +10288,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"supports-color": {
@@ -7055,10 +10323,17 @@
"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"js-base64": "2.4.9",
"source-map": "0.5.7",
"supports-color": "3.2.3"
+=======
+ "chalk": "^1.1.3",
+ "js-base64": "^2.1.9",
+ "source-map": "^0.5.6",
+ "supports-color": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map": {
@@ -7073,7 +10348,11 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "1.0.0"
+=======
+ "has-flag": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -7084,7 +10363,11 @@
"integrity": "sha512-T53GVFsdinJhgwm7rg1BzbeBRomOg9y5MBVhGcsV0CxurUdVj1UlPdKtn7aqYA/c/QVkzKMjq2bSV5dKG5+AwQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"postcss": "5.2.18"
+=======
+ "postcss": "^5.0.4"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -7099,11 +10382,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"supports-color": {
@@ -7126,10 +10417,17 @@
"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"js-base64": "2.4.9",
"source-map": "0.5.7",
"supports-color": "3.2.3"
+=======
+ "chalk": "^1.1.3",
+ "js-base64": "^2.1.9",
+ "source-map": "^0.5.6",
+ "supports-color": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map": {
@@ -7144,7 +10442,11 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "1.0.0"
+=======
+ "has-flag": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -7155,10 +10457,17 @@
"integrity": "sha512-5l327iI75POonjxkXgdRCUS+AlzAdBx4pOvMEhTKTCjb1p8IEeVR9yx3cPbmN7LIWJLbfnIXxAhoB4jpD0c/Cw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"postcss": "6.0.23",
"postcss-value-parser": "3.3.1",
"read-cache": "1.0.0",
"resolve": "1.8.1"
+=======
+ "postcss": "^6.0.1",
+ "postcss-value-parser": "^3.2.3",
+ "read-cache": "^1.0.0",
+ "resolve": "^1.1.7"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"postcss-load-config": {
@@ -7167,8 +10476,13 @@
"integrity": "sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"cosmiconfig": "4.0.0",
"import-cwd": "2.1.0"
+=======
+ "cosmiconfig": "^4.0.0",
+ "import-cwd": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"postcss-load-options": {
@@ -7177,8 +10491,13 @@
"integrity": "sha1-sJixVZ3awt8EvAuzdfmaXP4rbYw=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"cosmiconfig": "2.2.2",
"object-assign": "4.1.1"
+=======
+ "cosmiconfig": "^2.1.0",
+ "object-assign": "^4.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"cosmiconfig": {
@@ -7187,6 +10506,7 @@
"integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-directory": "0.3.1",
"js-yaml": "3.7.0",
"minimist": "1.2.0",
@@ -7194,6 +10514,15 @@
"os-homedir": "1.0.2",
"parse-json": "2.2.0",
"require-from-string": "1.2.1"
+=======
+ "is-directory": "^0.3.1",
+ "js-yaml": "^3.4.3",
+ "minimist": "^1.2.0",
+ "object-assign": "^4.1.0",
+ "os-homedir": "^1.0.1",
+ "parse-json": "^2.2.0",
+ "require-from-string": "^1.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"minimist": {
@@ -7216,8 +10545,13 @@
"integrity": "sha1-dFdoEWWZrKLwCfrUJrABdQSdjZI=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"cosmiconfig": "2.2.2",
"object-assign": "4.1.1"
+=======
+ "cosmiconfig": "^2.1.1",
+ "object-assign": "^4.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"cosmiconfig": {
@@ -7226,6 +10560,7 @@
"integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-directory": "0.3.1",
"js-yaml": "3.7.0",
"minimist": "1.2.0",
@@ -7233,6 +10568,15 @@
"os-homedir": "1.0.2",
"parse-json": "2.2.0",
"require-from-string": "1.2.1"
+=======
+ "is-directory": "^0.3.1",
+ "js-yaml": "^3.4.3",
+ "minimist": "^1.2.0",
+ "object-assign": "^4.1.0",
+ "os-homedir": "^1.0.1",
+ "parse-json": "^2.2.0",
+ "require-from-string": "^1.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"minimist": {
@@ -7255,10 +10599,17 @@
"integrity": "sha512-hgiWSc13xVQAq25cVw80CH0l49ZKlAnU1hKPOdRrNj89bokRr/bZF2nT+hebPPF9c9xs8c3gw3Fr2nxtmXYnNg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"loader-utils": "1.1.0",
"postcss": "6.0.23",
"postcss-load-config": "2.0.0",
"schema-utils": "0.4.7"
+=======
+ "loader-utils": "^1.1.0",
+ "postcss": "^6.0.0",
+ "postcss-load-config": "^2.0.0",
+ "schema-utils": "^0.4.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ajv": {
@@ -7267,10 +10618,17 @@
"integrity": "sha512-ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"fast-deep-equal": "2.0.1",
"fast-json-stable-stringify": "2.0.0",
"json-schema-traverse": "0.4.1",
"uri-js": "4.2.2"
+=======
+ "fast-deep-equal": "^2.0.1",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.4.1",
+ "uri-js": "^4.2.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"ajv-keywords": {
@@ -7297,8 +10655,13 @@
"integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ajv": "6.6.1",
"ajv-keywords": "3.2.0"
+=======
+ "ajv": "^6.1.0",
+ "ajv-keywords": "^3.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -7309,9 +10672,15 @@
"integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has": "1.0.3",
"postcss": "5.2.18",
"postcss-value-parser": "3.3.1"
+=======
+ "has": "^1.0.1",
+ "postcss": "^5.0.10",
+ "postcss-value-parser": "^3.1.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -7326,11 +10695,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"supports-color": {
@@ -7353,10 +10730,17 @@
"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"js-base64": "2.4.9",
"source-map": "0.5.7",
"supports-color": "3.2.3"
+=======
+ "chalk": "^1.1.3",
+ "js-base64": "^2.1.9",
+ "source-map": "^0.5.6",
+ "supports-color": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map": {
@@ -7371,7 +10755,11 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "1.0.0"
+=======
+ "has-flag": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -7382,7 +10770,11 @@
"integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"postcss": "5.2.18"
+=======
+ "postcss": "^5.0.4"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -7397,11 +10789,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"supports-color": {
@@ -7424,10 +10824,17 @@
"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"js-base64": "2.4.9",
"source-map": "0.5.7",
"supports-color": "3.2.3"
+=======
+ "chalk": "^1.1.3",
+ "js-base64": "^2.1.9",
+ "source-map": "^0.5.6",
+ "supports-color": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map": {
@@ -7442,7 +10849,11 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "1.0.0"
+=======
+ "has-flag": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -7453,11 +10864,19 @@
"integrity": "sha1-0d9d+qexrMO+VT8OnhDofGG19yE=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"browserslist": "1.7.7",
"caniuse-api": "1.6.1",
"postcss": "5.2.18",
"postcss-selector-parser": "2.2.3",
"vendors": "1.0.2"
+=======
+ "browserslist": "^1.5.2",
+ "caniuse-api": "^1.5.2",
+ "postcss": "^5.0.4",
+ "postcss-selector-parser": "^2.2.2",
+ "vendors": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -7472,8 +10891,13 @@
"integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"caniuse-db": "1.0.30000921",
"electron-to-chromium": "1.3.91"
+=======
+ "caniuse-db": "^1.0.30000639",
+ "electron-to-chromium": "^1.2.7"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"chalk": {
@@ -7482,11 +10906,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"supports-color": {
@@ -7509,10 +10941,17 @@
"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"js-base64": "2.4.9",
"source-map": "0.5.7",
"supports-color": "3.2.3"
+=======
+ "chalk": "^1.1.3",
+ "js-base64": "^2.1.9",
+ "source-map": "^0.5.6",
+ "supports-color": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map": {
@@ -7527,7 +10966,11 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "1.0.0"
+=======
+ "has-flag": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -7544,9 +10987,15 @@
"integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"object-assign": "4.1.1",
"postcss": "5.2.18",
"postcss-value-parser": "3.3.1"
+=======
+ "object-assign": "^4.0.1",
+ "postcss": "^5.0.4",
+ "postcss-value-parser": "^3.0.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -7561,11 +11010,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"supports-color": {
@@ -7588,10 +11045,17 @@
"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"js-base64": "2.4.9",
"source-map": "0.5.7",
"supports-color": "3.2.3"
+=======
+ "chalk": "^1.1.3",
+ "js-base64": "^2.1.9",
+ "source-map": "^0.5.6",
+ "supports-color": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map": {
@@ -7606,7 +11070,11 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "1.0.0"
+=======
+ "has-flag": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -7617,8 +11085,13 @@
"integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"postcss": "5.2.18",
"postcss-value-parser": "3.3.1"
+=======
+ "postcss": "^5.0.12",
+ "postcss-value-parser": "^3.3.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -7633,11 +11106,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"supports-color": {
@@ -7660,10 +11141,17 @@
"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"js-base64": "2.4.9",
"source-map": "0.5.7",
"supports-color": "3.2.3"
+=======
+ "chalk": "^1.1.3",
+ "js-base64": "^2.1.9",
+ "source-map": "^0.5.6",
+ "supports-color": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map": {
@@ -7678,7 +11166,11 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "1.0.0"
+=======
+ "has-flag": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -7689,10 +11181,17 @@
"integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"alphanum-sort": "1.0.2",
"postcss": "5.2.18",
"postcss-value-parser": "3.3.1",
"uniqs": "2.0.0"
+=======
+ "alphanum-sort": "^1.0.1",
+ "postcss": "^5.0.2",
+ "postcss-value-parser": "^3.0.2",
+ "uniqs": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -7707,11 +11206,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"supports-color": {
@@ -7734,10 +11241,17 @@
"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"js-base64": "2.4.9",
"source-map": "0.5.7",
"supports-color": "3.2.3"
+=======
+ "chalk": "^1.1.3",
+ "js-base64": "^2.1.9",
+ "source-map": "^0.5.6",
+ "supports-color": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map": {
@@ -7752,7 +11266,11 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "1.0.0"
+=======
+ "has-flag": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -7763,10 +11281,17 @@
"integrity": "sha1-ssapjAByz5G5MtGkllCBFDEXNb8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"alphanum-sort": "1.0.2",
"has": "1.0.3",
"postcss": "5.2.18",
"postcss-selector-parser": "2.2.3"
+=======
+ "alphanum-sort": "^1.0.2",
+ "has": "^1.0.1",
+ "postcss": "^5.0.14",
+ "postcss-selector-parser": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -7781,11 +11306,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"supports-color": {
@@ -7808,10 +11341,17 @@
"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"js-base64": "2.4.9",
"source-map": "0.5.7",
"supports-color": "3.2.3"
+=======
+ "chalk": "^1.1.3",
+ "js-base64": "^2.1.9",
+ "source-map": "^0.5.6",
+ "supports-color": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map": {
@@ -7826,7 +11366,11 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "1.0.0"
+=======
+ "has-flag": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -7837,7 +11381,11 @@
"integrity": "sha512-6jt9XZwUhwmRUhb/CkyJY020PYaPJsCyt3UjbaWo6XEbH/94Hmv6MP7fG2C5NDU/BcHzyGYxNtHvM+LTf9HrYw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"postcss": "6.0.23"
+=======
+ "postcss": "^6.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"postcss-modules-local-by-default": {
@@ -7846,8 +11394,13 @@
"integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"css-selector-tokenizer": "0.7.1",
"postcss": "6.0.23"
+=======
+ "css-selector-tokenizer": "^0.7.0",
+ "postcss": "^6.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"postcss-modules-scope": {
@@ -7856,8 +11409,13 @@
"integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"css-selector-tokenizer": "0.7.1",
"postcss": "6.0.23"
+=======
+ "css-selector-tokenizer": "^0.7.0",
+ "postcss": "^6.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"postcss-modules-values": {
@@ -7866,8 +11424,13 @@
"integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"icss-replace-symbols": "1.1.0",
"postcss": "6.0.23"
+=======
+ "icss-replace-symbols": "^1.1.0",
+ "postcss": "^6.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"postcss-normalize-charset": {
@@ -7876,7 +11439,11 @@
"integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"postcss": "5.2.18"
+=======
+ "postcss": "^5.0.5"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -7891,11 +11458,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"supports-color": {
@@ -7918,10 +11493,17 @@
"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"js-base64": "2.4.9",
"source-map": "0.5.7",
"supports-color": "3.2.3"
+=======
+ "chalk": "^1.1.3",
+ "js-base64": "^2.1.9",
+ "source-map": "^0.5.6",
+ "supports-color": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map": {
@@ -7936,7 +11518,11 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "1.0.0"
+=======
+ "has-flag": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -7947,10 +11533,17 @@
"integrity": "sha1-EI90s/L82viRov+j6kWSJ5/HgiI=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-absolute-url": "2.1.0",
"normalize-url": "1.9.1",
"postcss": "5.2.18",
"postcss-value-parser": "3.3.1"
+=======
+ "is-absolute-url": "^2.0.0",
+ "normalize-url": "^1.4.0",
+ "postcss": "^5.0.14",
+ "postcss-value-parser": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -7965,11 +11558,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"supports-color": {
@@ -7992,10 +11593,17 @@
"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"js-base64": "2.4.9",
"source-map": "0.5.7",
"supports-color": "3.2.3"
+=======
+ "chalk": "^1.1.3",
+ "js-base64": "^2.1.9",
+ "source-map": "^0.5.6",
+ "supports-color": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map": {
@@ -8010,7 +11618,11 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "1.0.0"
+=======
+ "has-flag": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -8021,8 +11633,13 @@
"integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"postcss": "5.2.18",
"postcss-value-parser": "3.3.1"
+=======
+ "postcss": "^5.0.4",
+ "postcss-value-parser": "^3.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -8037,11 +11654,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"supports-color": {
@@ -8064,10 +11689,17 @@
"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"js-base64": "2.4.9",
"source-map": "0.5.7",
"supports-color": "3.2.3"
+=======
+ "chalk": "^1.1.3",
+ "js-base64": "^2.1.9",
+ "source-map": "^0.5.6",
+ "supports-color": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map": {
@@ -8082,7 +11714,11 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "1.0.0"
+=======
+ "has-flag": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -8093,8 +11729,13 @@
"integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"postcss": "5.2.18",
"postcss-value-parser": "3.3.1"
+=======
+ "postcss": "^5.0.4",
+ "postcss-value-parser": "^3.0.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -8109,11 +11750,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"supports-color": {
@@ -8136,10 +11785,17 @@
"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"js-base64": "2.4.9",
"source-map": "0.5.7",
"supports-color": "3.2.3"
+=======
+ "chalk": "^1.1.3",
+ "js-base64": "^2.1.9",
+ "source-map": "^0.5.6",
+ "supports-color": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map": {
@@ -8154,7 +11810,11 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "1.0.0"
+=======
+ "has-flag": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -8165,7 +11825,11 @@
"integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"postcss": "5.2.18"
+=======
+ "postcss": "^5.0.4"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -8180,11 +11844,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"supports-color": {
@@ -8207,10 +11879,17 @@
"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"js-base64": "2.4.9",
"source-map": "0.5.7",
"supports-color": "3.2.3"
+=======
+ "chalk": "^1.1.3",
+ "js-base64": "^2.1.9",
+ "source-map": "^0.5.6",
+ "supports-color": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map": {
@@ -8225,7 +11904,11 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "1.0.0"
+=======
+ "has-flag": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -8236,9 +11919,15 @@
"integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has": "1.0.3",
"postcss": "5.2.18",
"postcss-value-parser": "3.3.1"
+=======
+ "has": "^1.0.1",
+ "postcss": "^5.0.8",
+ "postcss-value-parser": "^3.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -8253,11 +11942,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"supports-color": {
@@ -8280,10 +11977,17 @@
"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"js-base64": "2.4.9",
"source-map": "0.5.7",
"supports-color": "3.2.3"
+=======
+ "chalk": "^1.1.3",
+ "js-base64": "^2.1.9",
+ "source-map": "^0.5.6",
+ "supports-color": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map": {
@@ -8298,7 +12002,11 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "1.0.0"
+=======
+ "has-flag": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -8309,9 +12017,15 @@
"integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"flatten": "1.0.2",
"indexes-of": "1.0.1",
"uniq": "1.0.1"
+=======
+ "flatten": "^1.0.2",
+ "indexes-of": "^1.0.1",
+ "uniq": "^1.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"postcss-svgo": {
@@ -8320,10 +12034,17 @@
"integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-svg": "2.1.0",
"postcss": "5.2.18",
"postcss-value-parser": "3.3.1",
"svgo": "0.7.2"
+=======
+ "is-svg": "^2.0.0",
+ "postcss": "^5.0.14",
+ "postcss-value-parser": "^3.2.3",
+ "svgo": "^0.7.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -8338,11 +12059,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"supports-color": {
@@ -8365,10 +12094,17 @@
"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"js-base64": "2.4.9",
"source-map": "0.5.7",
"supports-color": "3.2.3"
+=======
+ "chalk": "^1.1.3",
+ "js-base64": "^2.1.9",
+ "source-map": "^0.5.6",
+ "supports-color": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map": {
@@ -8383,7 +12119,11 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "1.0.0"
+=======
+ "has-flag": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -8394,9 +12134,15 @@
"integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"alphanum-sort": "1.0.2",
"postcss": "5.2.18",
"uniqs": "2.0.0"
+=======
+ "alphanum-sort": "^1.0.1",
+ "postcss": "^5.0.4",
+ "uniqs": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -8411,11 +12157,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"supports-color": {
@@ -8438,10 +12192,17 @@
"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"js-base64": "2.4.9",
"source-map": "0.5.7",
"supports-color": "3.2.3"
+=======
+ "chalk": "^1.1.3",
+ "js-base64": "^2.1.9",
+ "source-map": "^0.5.6",
+ "supports-color": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map": {
@@ -8456,7 +12217,11 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "1.0.0"
+=======
+ "has-flag": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -8467,11 +12232,19 @@
"integrity": "sha512-QMV5mA+pCYZQcUEPQkmor9vcPQ2MT+Ipuu8qdi1gVxbNiIiErEGft+eny1ak19qALoBkccS5AHaCaCDzh7b9MA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"mime": "1.6.0",
"minimatch": "3.0.4",
"mkdirp": "0.5.1",
"postcss": "6.0.23",
"xxhashjs": "0.2.2"
+=======
+ "mime": "^1.4.1",
+ "minimatch": "^3.0.4",
+ "mkdirp": "^0.5.0",
+ "postcss": "^6.0.1",
+ "xxhashjs": "^0.2.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"postcss-value-parser": {
@@ -8486,9 +12259,15 @@
"integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has": "1.0.3",
"postcss": "5.2.18",
"uniqs": "2.0.0"
+=======
+ "has": "^1.0.1",
+ "postcss": "^5.0.4",
+ "uniqs": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-styles": {
@@ -8503,11 +12282,19 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
+=======
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"supports-color": {
@@ -8530,10 +12317,17 @@
"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chalk": "1.1.3",
"js-base64": "2.4.9",
"source-map": "0.5.7",
"supports-color": "3.2.3"
+=======
+ "chalk": "^1.1.3",
+ "js-base64": "^2.1.9",
+ "source-map": "^0.5.6",
+ "supports-color": "^3.2.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map": {
@@ -8548,7 +12342,11 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "1.0.0"
+=======
+ "has-flag": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -8583,8 +12381,13 @@
"integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"renderkid": "2.0.2",
"utila": "0.4.0"
+=======
+ "renderkid": "^2.0.1",
+ "utila": "~0.4"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"private": {
@@ -8623,7 +12426,11 @@
"integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"forwarded": "0.1.2",
+=======
+ "forwarded": "~0.1.2",
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"ipaddr.js": "1.8.0"
}
},
@@ -8639,18 +12446,36 @@
"integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "psl": {
+ "version": "1.1.31",
+ "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz",
+ "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==",
+ "dev": true
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"public-encrypt": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
"integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"bn.js": "4.11.8",
"browserify-rsa": "4.0.1",
"create-hash": "1.2.0",
"parse-asn1": "5.1.1",
"randombytes": "2.0.6",
"safe-buffer": "5.1.2"
+=======
+ "bn.js": "^4.1.0",
+ "browserify-rsa": "^4.0.0",
+ "create-hash": "^1.1.0",
+ "parse-asn1": "^5.0.0",
+ "randombytes": "^2.0.1",
+ "safe-buffer": "^5.1.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"pump": {
@@ -8659,8 +12484,13 @@
"integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"end-of-stream": "1.4.1",
"once": "1.4.0"
+=======
+ "end-of-stream": "^1.1.0",
+ "once": "^1.3.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"pumpify": {
@@ -8669,9 +12499,15 @@
"integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"duplexify": "3.6.1",
"inherits": "2.0.3",
"pump": "2.0.1"
+=======
+ "duplexify": "^3.6.0",
+ "inherits": "^2.0.3",
+ "pump": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"punycode": {
@@ -8698,8 +12534,13 @@
"integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"object-assign": "4.1.1",
"strict-uri-encode": "1.1.0"
+=======
+ "object-assign": "^4.1.0",
+ "strict-uri-encode": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"querystring": {
@@ -8720,15 +12561,29 @@
"integrity": "sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "raf.js": {
+ "version": "0.0.4",
+ "resolved": "https://registry.npmjs.org/raf.js/-/raf.js-0.0.4.tgz",
+ "integrity": "sha1-8Vr0RdJBsn+nExpXRQtn75xAL+w="
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"randomatic": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
"integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-number": "4.0.0",
"kind-of": "6.0.2",
"math-random": "1.0.1"
+=======
+ "is-number": "^4.0.0",
+ "kind-of": "^6.0.0",
+ "math-random": "^1.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"is-number": {
@@ -8751,7 +12606,11 @@
"integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"safe-buffer": "5.1.2"
+=======
+ "safe-buffer": "^5.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"randomfill": {
@@ -8760,8 +12619,13 @@
"integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"randombytes": "2.0.6",
"safe-buffer": "5.1.2"
+=======
+ "randombytes": "^2.0.5",
+ "safe-buffer": "^5.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"range-parser": {
@@ -8788,7 +12652,11 @@
"integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"safer-buffer": "2.1.2"
+=======
+ "safer-buffer": ">= 2.1.2 < 3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -8799,7 +12667,11 @@
"integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"pify": "2.3.0"
+=======
+ "pify": "^2.3.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"pify": {
@@ -8816,9 +12688,15 @@
"integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"load-json-file": "2.0.0",
"normalize-package-data": "2.4.0",
"path-type": "2.0.0"
+=======
+ "load-json-file": "^2.0.0",
+ "normalize-package-data": "^2.3.2",
+ "path-type": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"path-type": {
@@ -8827,7 +12705,11 @@
"integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"pify": "2.3.0"
+=======
+ "pify": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"pify": {
@@ -8844,8 +12726,13 @@
"integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"find-up": "2.1.0",
"read-pkg": "2.0.0"
+=======
+ "find-up": "^2.0.0",
+ "read-pkg": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"readable-stream": {
@@ -8854,6 +12741,7 @@
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"core-util-is": "1.0.2",
"inherits": "2.0.3",
"isarray": "1.0.0",
@@ -8861,6 +12749,15 @@
"safe-buffer": "5.1.2",
"string_decoder": "1.1.1",
"util-deprecate": "1.0.2"
+=======
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"readdirp": {
@@ -8869,9 +12766,15 @@
"integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"graceful-fs": "4.1.15",
"micromatch": "3.1.10",
"readable-stream": "2.3.6"
+=======
+ "graceful-fs": "^4.1.11",
+ "micromatch": "^3.1.10",
+ "readable-stream": "^2.0.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"rechoir": {
@@ -8880,7 +12783,11 @@
"integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"resolve": "1.8.1"
+=======
+ "resolve": "^1.1.6"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"redent": {
@@ -8889,8 +12796,13 @@
"integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"indent-string": "2.1.0",
"strip-indent": "1.0.1"
+=======
+ "indent-string": "^2.1.0",
+ "strip-indent": "^1.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"reduce-css-calc": {
@@ -8899,9 +12811,15 @@
"integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"balanced-match": "0.4.2",
"math-expression-evaluator": "1.2.17",
"reduce-function-call": "1.0.2"
+=======
+ "balanced-match": "^0.4.2",
+ "math-expression-evaluator": "^1.2.14",
+ "reduce-function-call": "^1.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"balanced-match": {
@@ -8918,7 +12836,11 @@
"integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"balanced-match": "0.4.2"
+=======
+ "balanced-match": "^0.4.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"balanced-match": {
@@ -8947,9 +12869,15 @@
"integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"babel-runtime": "6.26.0",
"babel-types": "6.26.0",
"private": "0.1.8"
+=======
+ "babel-runtime": "^6.18.0",
+ "babel-types": "^6.19.0",
+ "private": "^0.1.6"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"regex-cache": {
@@ -8958,7 +12886,11 @@
"integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-equal-shallow": "0.1.3"
+=======
+ "is-equal-shallow": "^0.1.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"regex-not": {
@@ -8967,8 +12899,13 @@
"integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"extend-shallow": "3.0.2",
"safe-regex": "1.1.0"
+=======
+ "extend-shallow": "^3.0.2",
+ "safe-regex": "^1.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"regexpp": {
@@ -8983,9 +12920,15 @@
"integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"regenerate": "1.4.0",
"regjsgen": "0.2.0",
"regjsparser": "0.1.5"
+=======
+ "regenerate": "^1.2.1",
+ "regjsgen": "^0.2.0",
+ "regjsparser": "^0.1.4"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"regjsgen": {
@@ -9000,7 +12943,11 @@
"integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"jsesc": "0.5.0"
+=======
+ "jsesc": "~0.5.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"jsesc": {
@@ -9029,11 +12976,19 @@
"integrity": "sha512-FsygIxevi1jSiPY9h7vZmBFUbAOcbYm9UwyiLNdVsLRs/5We9Ob5NMPbGYUTWiLq5L+ezlVdE0A8bbME5CWTpg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"css-select": "1.2.0",
"dom-converter": "0.2.0",
"htmlparser2": "3.3.0",
"strip-ansi": "3.0.1",
"utila": "0.4.0"
+=======
+ "css-select": "^1.1.0",
+ "dom-converter": "~0.2",
+ "htmlparser2": "~3.3.0",
+ "strip-ansi": "^3.0.0",
+ "utila": "^0.4.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"repeat-element": {
@@ -9054,7 +13009,39 @@
"integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-finite": "1.0.2"
+=======
+ "is-finite": "^1.0.0"
+ }
+ },
+ "request": {
+ "version": "2.88.0",
+ "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+ "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+ "dev": true,
+ "requires": {
+ "aws-sign2": "~0.7.0",
+ "aws4": "^1.8.0",
+ "caseless": "~0.12.0",
+ "combined-stream": "~1.0.6",
+ "extend": "~3.0.2",
+ "forever-agent": "~0.6.1",
+ "form-data": "~2.3.2",
+ "har-validator": "~5.1.0",
+ "http-signature": "~1.2.0",
+ "is-typedarray": "~1.0.0",
+ "isstream": "~0.1.2",
+ "json-stringify-safe": "~5.0.1",
+ "mime-types": "~2.1.19",
+ "oauth-sign": "~0.9.0",
+ "performance-now": "^2.1.0",
+ "qs": "~6.5.2",
+ "safe-buffer": "^5.1.2",
+ "tough-cookie": "~2.4.3",
+ "tunnel-agent": "^0.6.0",
+ "uuid": "^3.3.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"require-directory": {
@@ -9081,8 +13068,13 @@
"integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"caller-path": "0.1.0",
"resolve-from": "1.0.1"
+=======
+ "caller-path": "^0.1.0",
+ "resolve-from": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"requires-port": {
@@ -9097,7 +13089,11 @@
"integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"path-parse": "1.0.6"
+=======
+ "path-parse": "^1.0.5"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"resolve-cwd": {
@@ -9106,7 +13102,11 @@
"integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"resolve-from": "3.0.0"
+=======
+ "resolve-from": "^3.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"resolve-from": {
@@ -9135,8 +13135,13 @@
"integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"onetime": "2.0.1",
"signal-exit": "3.0.2"
+=======
+ "onetime": "^2.0.0",
+ "signal-exit": "^3.0.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"ret": {
@@ -9151,7 +13156,11 @@
"integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"align-text": "0.1.4"
+=======
+ "align-text": "^0.1.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"rimraf": {
@@ -9160,7 +13169,11 @@
"integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"glob": "7.1.3"
+=======
+ "glob": "^7.0.5"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"ripemd160": {
@@ -9169,8 +13182,13 @@
"integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"hash-base": "3.0.4",
"inherits": "2.0.3"
+=======
+ "hash-base": "^3.0.0",
+ "inherits": "^2.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"run-async": {
@@ -9179,7 +13197,11 @@
"integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-promise": "2.1.0"
+=======
+ "is-promise": "^2.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"run-queue": {
@@ -9188,7 +13210,11 @@
"integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"aproba": "1.2.0"
+=======
+ "aproba": "^1.1.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"rx-lite": {
@@ -9203,7 +13229,11 @@
"integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"rx-lite": "4.0.8"
+=======
+ "rx-lite": "*"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"safe-buffer": {
@@ -9218,7 +13248,11 @@
"integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ret": "0.1.15"
+=======
+ "ret": "~0.1.10"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"safer-buffer": {
@@ -9227,6 +13261,204 @@
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "sass-graph": {
+ "version": "2.2.4",
+ "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
+ "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
+ "dev": true,
+ "requires": {
+ "glob": "^7.0.0",
+ "lodash": "^4.0.0",
+ "scss-tokenizer": "^0.2.3",
+ "yargs": "^7.0.0"
+ },
+ "dependencies": {
+ "camelcase": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+ "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+ "dev": true
+ },
+ "cliui": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+ "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+ "dev": true,
+ "requires": {
+ "string-width": "^1.0.1",
+ "strip-ansi": "^3.0.1",
+ "wrap-ansi": "^2.0.0"
+ }
+ },
+ "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.0.0",
+ "pinkie-promise": "^2.0.0"
+ }
+ },
+ "is-fullwidth-code-point": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+ "dev": true,
+ "requires": {
+ "number-is-nan": "^1.0.0"
+ }
+ },
+ "load-json-file": {
+ "version": "1.1.0",
+ "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+ "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "^4.1.2",
+ "parse-json": "^2.2.0",
+ "pify": "^2.0.0",
+ "pinkie-promise": "^2.0.0",
+ "strip-bom": "^2.0.0"
+ }
+ },
+ "os-locale": {
+ "version": "1.4.0",
+ "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+ "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+ "dev": true,
+ "requires": {
+ "lcid": "^1.0.0"
+ }
+ },
+ "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.0"
+ }
+ },
+ "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.2",
+ "pify": "^2.0.0",
+ "pinkie-promise": "^2.0.0"
+ }
+ },
+ "pify": {
+ "version": "2.3.0",
+ "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+ "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+ "dev": true
+ },
+ "read-pkg": {
+ "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.0.0",
+ "normalize-package-data": "^2.3.2",
+ "path-type": "^1.0.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.0.0",
+ "read-pkg": "^1.0.0"
+ }
+ },
+ "string-width": {
+ "version": "1.0.2",
+ "resolved": "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+ "dev": true,
+ "requires": {
+ "code-point-at": "^1.0.0",
+ "is-fullwidth-code-point": "^1.0.0",
+ "strip-ansi": "^3.0.0"
+ }
+ },
+ "strip-bom": {
+ "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.0"
+ }
+ },
+ "which-module": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+ "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+ "dev": true
+ },
+ "y18n": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+ "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+ "dev": true
+ },
+ "yargs": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
+ "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
+ "dev": true,
+ "requires": {
+ "camelcase": "^3.0.0",
+ "cliui": "^3.2.0",
+ "decamelize": "^1.1.1",
+ "get-caller-file": "^1.0.1",
+ "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": "^5.0.0"
+ }
+ },
+ "yargs-parser": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
+ "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+ "dev": true,
+ "requires": {
+ "camelcase": "^3.0.0"
+ }
+ }
+ }
+ },
+ "sass-loader": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.1.0.tgz",
+ "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==",
+ "dev": true,
+ "requires": {
+ "clone-deep": "^2.0.1",
+ "loader-utils": "^1.0.1",
+ "lodash.tail": "^4.1.1",
+ "neo-async": "^2.5.0",
+ "pify": "^3.0.0",
+ "semver": "^5.5.0"
+ }
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"sax": {
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
@@ -9239,7 +13471,32 @@
"integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ajv": "5.5.2"
+=======
+ "ajv": "^5.0.0"
+ }
+ },
+ "scss-tokenizer": {
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
+ "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
+ "dev": true,
+ "requires": {
+ "js-base64": "^2.1.8",
+ "source-map": "^0.4.2"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.4.4",
+ "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+ "dev": true,
+ "requires": {
+ "amdefine": ">=0.0.4"
+ }
+ }
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"select-hose": {
@@ -9270,6 +13527,7 @@
"dev": true,
"requires": {
"debug": "2.6.9",
+<<<<<<< HEAD
"depd": "1.1.2",
"destroy": "1.0.4",
"encodeurl": "1.0.2",
@@ -9282,6 +13540,20 @@
"on-finished": "2.3.0",
"range-parser": "1.2.0",
"statuses": "1.4.0"
+=======
+ "depd": "~1.1.2",
+ "destroy": "~1.0.4",
+ "encodeurl": "~1.0.2",
+ "escape-html": "~1.0.3",
+ "etag": "~1.8.1",
+ "fresh": "0.5.2",
+ "http-errors": "~1.6.2",
+ "mime": "1.4.1",
+ "ms": "2.0.0",
+ "on-finished": "~2.3.0",
+ "range-parser": "~1.2.0",
+ "statuses": "~1.4.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"mime": {
@@ -9304,6 +13576,7 @@
"integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"accepts": "1.3.5",
"batch": "0.6.1",
"debug": "2.6.9",
@@ -9311,6 +13584,15 @@
"http-errors": "1.6.3",
"mime-types": "2.1.21",
"parseurl": "1.3.2"
+=======
+ "accepts": "~1.3.4",
+ "batch": "0.6.1",
+ "debug": "2.6.9",
+ "escape-html": "~1.0.3",
+ "http-errors": "~1.6.2",
+ "mime-types": "~2.1.17",
+ "parseurl": "~1.3.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"serve-static": {
@@ -9319,9 +13601,15 @@
"integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"encodeurl": "1.0.2",
"escape-html": "1.0.3",
"parseurl": "1.3.2",
+=======
+ "encodeurl": "~1.0.2",
+ "escape-html": "~1.0.3",
+ "parseurl": "~1.3.2",
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"send": "0.16.2"
}
},
@@ -9337,10 +13625,17 @@
"integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"extend-shallow": "2.0.1",
"is-extendable": "0.1.1",
"is-plain-object": "2.0.4",
"split-string": "3.1.0"
+=======
+ "extend-shallow": "^2.0.1",
+ "is-extendable": "^0.1.1",
+ "is-plain-object": "^2.0.3",
+ "split-string": "^3.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"extend-shallow": {
@@ -9349,7 +13644,11 @@
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-extendable": "0.1.1"
+=======
+ "is-extendable": "^0.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -9372,8 +13671,32 @@
"integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"inherits": "2.0.3",
"safe-buffer": "5.1.2"
+=======
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.0.1"
+ }
+ },
+ "shallow-clone": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz",
+ "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
+ "dev": true,
+ "requires": {
+ "is-extendable": "^0.1.1",
+ "kind-of": "^5.0.0",
+ "mixin-object": "^2.0.1"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+ "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+ "dev": true
+ }
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"shebang-command": {
@@ -9382,7 +13705,11 @@
"integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"shebang-regex": "1.0.0"
+=======
+ "shebang-regex": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"shebang-regex": {
@@ -9397,9 +13724,15 @@
"integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"glob": "7.1.3",
"interpret": "1.1.0",
"rechoir": "0.6.2"
+=======
+ "glob": "^7.0.0",
+ "interpret": "^1.0.0",
+ "rechoir": "^0.6.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"shellwords": {
@@ -9426,7 +13759,11 @@
"integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-fullwidth-code-point": "2.0.0"
+=======
+ "is-fullwidth-code-point": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"snapdragon": {
@@ -9435,6 +13772,7 @@
"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"base": "0.11.2",
"debug": "2.6.9",
"define-property": "0.2.5",
@@ -9443,6 +13781,16 @@
"source-map": "0.5.7",
"source-map-resolve": "0.5.2",
"use": "3.1.1"
+=======
+ "base": "^0.11.1",
+ "debug": "^2.2.0",
+ "define-property": "^0.2.5",
+ "extend-shallow": "^2.0.1",
+ "map-cache": "^0.2.2",
+ "source-map": "^0.5.6",
+ "source-map-resolve": "^0.5.0",
+ "use": "^3.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"define-property": {
@@ -9451,7 +13799,11 @@
"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-descriptor": "0.1.6"
+=======
+ "is-descriptor": "^0.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"extend-shallow": {
@@ -9460,7 +13812,11 @@
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-extendable": "0.1.1"
+=======
+ "is-extendable": "^0.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map": {
@@ -9477,9 +13833,15 @@
"integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"define-property": "1.0.0",
"isobject": "3.0.1",
"snapdragon-util": "3.0.1"
+=======
+ "define-property": "^1.0.0",
+ "isobject": "^3.0.0",
+ "snapdragon-util": "^3.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"define-property": {
@@ -9488,7 +13850,11 @@
"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-descriptor": "1.0.2"
+=======
+ "is-descriptor": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"is-accessor-descriptor": {
@@ -9497,7 +13863,11 @@
"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"kind-of": "6.0.2"
+=======
+ "kind-of": "^6.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"is-data-descriptor": {
@@ -9506,7 +13876,11 @@
"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"kind-of": "6.0.2"
+=======
+ "kind-of": "^6.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"is-descriptor": {
@@ -9515,9 +13889,15 @@
"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-accessor-descriptor": "1.0.0",
"is-data-descriptor": "1.0.0",
"kind-of": "6.0.2"
+=======
+ "is-accessor-descriptor": "^1.0.0",
+ "is-data-descriptor": "^1.0.0",
+ "kind-of": "^6.0.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"kind-of": {
@@ -9534,7 +13914,11 @@
"integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"kind-of": "3.2.2"
+=======
+ "kind-of": "^3.2.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"sockjs": {
@@ -9543,8 +13927,13 @@
"integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"faye-websocket": "0.10.0",
"uuid": "3.3.2"
+=======
+ "faye-websocket": "^0.10.0",
+ "uuid": "^3.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"sockjs-client": {
@@ -9553,12 +13942,21 @@
"integrity": "sha1-G7fA9yIsQPQq3xT0RCy9Eml3GoM=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"debug": "2.6.9",
"eventsource": "0.1.6",
"faye-websocket": "0.11.1",
"inherits": "2.0.3",
"json3": "3.3.2",
"url-parse": "1.4.4"
+=======
+ "debug": "^2.6.6",
+ "eventsource": "0.1.6",
+ "faye-websocket": "~0.11.0",
+ "inherits": "^2.0.1",
+ "json3": "^3.3.2",
+ "url-parse": "^1.1.8"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"faye-websocket": {
@@ -9567,7 +13965,11 @@
"integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"websocket-driver": "0.7.0"
+=======
+ "websocket-driver": ">=0.5.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -9578,7 +13980,11 @@
"integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-plain-obj": "1.1.0"
+=======
+ "is-plain-obj": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-list-map": {
@@ -9599,11 +14005,19 @@
"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"atob": "2.1.2",
"decode-uri-component": "0.2.0",
"resolve-url": "0.2.1",
"source-map-url": "0.4.0",
"urix": "0.1.0"
+=======
+ "atob": "^2.1.1",
+ "decode-uri-component": "^0.2.0",
+ "resolve-url": "^0.2.1",
+ "source-map-url": "^0.4.0",
+ "urix": "^0.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"source-map-support": {
@@ -9612,7 +14026,11 @@
"integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"source-map": "0.5.7"
+=======
+ "source-map": "^0.5.6"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"source-map": {
@@ -9635,8 +14053,13 @@
"integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"spdx-expression-parse": "3.0.0",
"spdx-license-ids": "3.0.2"
+=======
+ "spdx-expression-parse": "^3.0.0",
+ "spdx-license-ids": "^3.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"spdx-exceptions": {
@@ -9651,8 +14074,13 @@
"integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"spdx-exceptions": "2.2.0",
"spdx-license-ids": "3.0.2"
+=======
+ "spdx-exceptions": "^2.1.0",
+ "spdx-license-ids": "^3.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"spdx-license-ids": {
@@ -9667,12 +14095,21 @@
"integrity": "sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"debug": "2.6.9",
"handle-thing": "1.2.5",
"http-deceiver": "1.2.7",
"safe-buffer": "5.1.2",
"select-hose": "2.0.0",
"spdy-transport": "2.1.1"
+=======
+ "debug": "^2.6.8",
+ "handle-thing": "^1.2.5",
+ "http-deceiver": "^1.2.7",
+ "safe-buffer": "^5.0.1",
+ "select-hose": "^2.0.0",
+ "spdy-transport": "^2.0.18"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"spdy-transport": {
@@ -9681,6 +14118,7 @@
"integrity": "sha512-q7D8c148escoB3Z7ySCASadkegMmUZW8Wb/Q1u0/XBgDKMO880rLQDj8Twiew/tYi7ghemKUi/whSYOwE17f5Q==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"debug": "2.6.9",
"detect-node": "2.0.4",
"hpack.js": "2.1.6",
@@ -9688,6 +14126,15 @@
"readable-stream": "2.3.6",
"safe-buffer": "5.1.2",
"wbuf": "1.7.3"
+=======
+ "debug": "^2.6.8",
+ "detect-node": "^2.0.3",
+ "hpack.js": "^2.1.6",
+ "obuf": "^1.1.1",
+ "readable-stream": "^2.2.9",
+ "safe-buffer": "^5.0.1",
+ "wbuf": "^1.7.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"split-string": {
@@ -9696,7 +14143,11 @@
"integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"extend-shallow": "3.0.2"
+=======
+ "extend-shallow": "^3.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"sprintf-js": {
@@ -9705,13 +14156,37 @@
"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "sshpk": {
+ "version": "1.15.2",
+ "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.15.2.tgz",
+ "integrity": "sha512-Ra/OXQtuh0/enyl4ETZAfTaeksa6BXks5ZcjpSUNrjBr0DvrJKX+1fsKDPpT9TBXgHAFsa4510aNVgI8g/+SzA==",
+ "dev": true,
+ "requires": {
+ "asn1": "~0.2.3",
+ "assert-plus": "^1.0.0",
+ "bcrypt-pbkdf": "^1.0.0",
+ "dashdash": "^1.12.0",
+ "ecc-jsbn": "~0.1.1",
+ "getpass": "^0.1.1",
+ "jsbn": "~0.1.0",
+ "safer-buffer": "^2.0.2",
+ "tweetnacl": "~0.14.0"
+ }
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"ssri": {
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz",
"integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"safe-buffer": "5.1.2"
+=======
+ "safe-buffer": "^5.1.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"stackframe": {
@@ -9726,8 +14201,13 @@
"integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"define-property": "0.2.5",
"object-copy": "0.1.0"
+=======
+ "define-property": "^0.2.5",
+ "object-copy": "^0.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"define-property": {
@@ -9736,7 +14216,11 @@
"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-descriptor": "0.1.6"
+=======
+ "is-descriptor": "^0.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -9747,14 +14231,31 @@
"integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "stdout-stream": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
+ "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
+ "dev": true,
+ "requires": {
+ "readable-stream": "^2.0.1"
+ }
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"stream-browserify": {
"version": "2.0.1",
"resolved": "http://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
"integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"inherits": "2.0.3",
"readable-stream": "2.3.6"
+=======
+ "inherits": "~2.0.1",
+ "readable-stream": "^2.0.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"stream-each": {
@@ -9763,8 +14264,13 @@
"integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"end-of-stream": "1.4.1",
"stream-shift": "1.0.0"
+=======
+ "end-of-stream": "^1.1.0",
+ "stream-shift": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"stream-http": {
@@ -9773,11 +14279,19 @@
"integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"builtin-status-codes": "3.0.0",
"inherits": "2.0.3",
"readable-stream": "2.3.6",
"to-arraybuffer": "1.0.1",
"xtend": "4.0.1"
+=======
+ "builtin-status-codes": "^3.0.0",
+ "inherits": "^2.0.1",
+ "readable-stream": "^2.3.6",
+ "to-arraybuffer": "^1.0.0",
+ "xtend": "^4.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"stream-shift": {
@@ -9798,8 +14312,13 @@
"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-fullwidth-code-point": "2.0.0",
"strip-ansi": "4.0.0"
+=======
+ "is-fullwidth-code-point": "^2.0.0",
+ "strip-ansi": "^4.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ansi-regex": {
@@ -9814,7 +14333,11 @@
"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-regex": "3.0.0"
+=======
+ "ansi-regex": "^3.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -9825,7 +14348,11 @@
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"safe-buffer": "5.1.2"
+=======
+ "safe-buffer": "~5.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"strip-ansi": {
@@ -9834,7 +14361,11 @@
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ansi-regex": "2.1.1"
+=======
+ "ansi-regex": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"strip-bom": {
@@ -9855,7 +14386,11 @@
"integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"get-stdin": "4.0.1"
+=======
+ "get-stdin": "^4.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"strip-json-comments": {
@@ -9870,7 +14405,11 @@
"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "3.0.0"
+=======
+ "has-flag": "^3.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"svgo": {
@@ -9879,6 +14418,7 @@
"integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"coa": "1.0.4",
"colors": "1.1.2",
"csso": "2.3.2",
@@ -9886,6 +14426,15 @@
"mkdirp": "0.5.1",
"sax": "1.2.4",
"whet.extend": "0.9.9"
+=======
+ "coa": "~1.0.1",
+ "colors": "~1.1.2",
+ "csso": "~2.3.1",
+ "js-yaml": "~3.7.0",
+ "mkdirp": "~0.5.1",
+ "sax": "~1.2.1",
+ "whet.extend": "~0.9.9"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"table": {
@@ -9894,12 +14443,21 @@
"integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ajv": "5.5.2",
"ajv-keywords": "2.1.1",
"chalk": "2.4.1",
"lodash": "4.17.11",
"slice-ansi": "1.0.0",
"string-width": "2.1.1"
+=======
+ "ajv": "^5.2.3",
+ "ajv-keywords": "^2.1.0",
+ "chalk": "^2.1.0",
+ "lodash": "^4.17.4",
+ "slice-ansi": "1.0.0",
+ "string-width": "^2.1.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"tapable": {
@@ -9908,6 +14466,20 @@
"integrity": "sha512-2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "tar": {
+ "version": "2.2.1",
+ "resolved": "http://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+ "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
+ "dev": true,
+ "requires": {
+ "block-stream": "*",
+ "fstream": "^1.0.2",
+ "inherits": "2"
+ }
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"text-table": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -9926,8 +14498,13 @@
"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"readable-stream": "2.3.6",
"xtend": "4.0.1"
+=======
+ "readable-stream": "~2.3.6",
+ "xtend": "~4.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"thunky": {
@@ -9948,7 +14525,11 @@
"integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"setimmediate": "1.0.5"
+=======
+ "setimmediate": "^1.0.4"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"tmp": {
@@ -9957,7 +14538,11 @@
"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"os-tmpdir": "1.0.2"
+=======
+ "os-tmpdir": "~1.0.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"to-arraybuffer": {
@@ -9978,7 +14563,11 @@
"integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"kind-of": "3.2.2"
+=======
+ "kind-of": "^3.0.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"to-regex": {
@@ -9987,10 +14576,17 @@
"integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"define-property": "2.0.2",
"extend-shallow": "3.0.2",
"regex-not": "1.0.2",
"safe-regex": "1.1.0"
+=======
+ "define-property": "^2.0.2",
+ "extend-shallow": "^3.0.2",
+ "regex-not": "^1.0.2",
+ "safe-regex": "^1.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"to-regex-range": {
@@ -9999,8 +14595,13 @@
"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-number": "3.0.0",
"repeat-string": "1.6.1"
+=======
+ "is-number": "^3.0.0",
+ "repeat-string": "^1.6.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"toposort": {
@@ -10009,6 +14610,27 @@
"integrity": "sha1-LmhELZ9k7HILjMieZEOsbKqVACk=",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "tough-cookie": {
+ "version": "2.4.3",
+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+ "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+ "dev": true,
+ "requires": {
+ "psl": "^1.1.24",
+ "punycode": "^1.4.1"
+ },
+ "dependencies": {
+ "punycode": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+ "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+ "dev": true
+ }
+ }
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"trim-newlines": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
@@ -10021,6 +14643,18 @@
"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "true-case-path": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
+ "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
+ "dev": true,
+ "requires": {
+ "glob": "^7.1.2"
+ }
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"tryer": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
@@ -10033,13 +14667,35 @@
"integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "tunnel-agent": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+ "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+ "dev": true,
+ "requires": {
+ "safe-buffer": "^5.0.1"
+ }
+ },
+ "tweetnacl": {
+ "version": "0.14.5",
+ "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+ "dev": true
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"type-check": {
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"prelude-ls": "1.1.2"
+=======
+ "prelude-ls": "~1.1.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"type-is": {
@@ -10049,7 +14705,11 @@
"dev": true,
"requires": {
"media-typer": "0.3.0",
+<<<<<<< HEAD
"mime-types": "2.1.21"
+=======
+ "mime-types": "~2.1.18"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"typedarray": {
@@ -10064,8 +14724,13 @@
"integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"commander": "2.17.1",
"source-map": "0.6.1"
+=======
+ "commander": "~2.17.1",
+ "source-map": "~0.6.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"uglify-to-browserify": {
@@ -10081,6 +14746,7 @@
"integrity": "sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"cacache": "10.0.4",
"find-cache-dir": "1.0.0",
"schema-utils": "0.4.7",
@@ -10089,6 +14755,16 @@
"uglify-es": "3.3.9",
"webpack-sources": "1.3.0",
"worker-farm": "1.6.0"
+=======
+ "cacache": "^10.0.4",
+ "find-cache-dir": "^1.0.0",
+ "schema-utils": "^0.4.5",
+ "serialize-javascript": "^1.4.0",
+ "source-map": "^0.6.1",
+ "uglify-es": "^3.3.4",
+ "webpack-sources": "^1.1.0",
+ "worker-farm": "^1.5.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ajv": {
@@ -10097,10 +14773,17 @@
"integrity": "sha512-ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"fast-deep-equal": "2.0.1",
"fast-json-stable-stringify": "2.0.0",
"json-schema-traverse": "0.4.1",
"uri-js": "4.2.2"
+=======
+ "fast-deep-equal": "^2.0.1",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.4.1",
+ "uri-js": "^4.2.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"ajv-keywords": {
@@ -10133,8 +14816,13 @@
"integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ajv": "6.6.1",
"ajv-keywords": "3.2.0"
+=======
+ "ajv": "^6.1.0",
+ "ajv-keywords": "^3.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"uglify-es": {
@@ -10143,8 +14831,13 @@
"integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"commander": "2.13.0",
"source-map": "0.6.1"
+=======
+ "commander": "~2.13.0",
+ "source-map": "~0.6.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -10155,10 +14848,17 @@
"integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"arr-union": "3.1.0",
"get-value": "2.0.6",
"is-extendable": "0.1.1",
"set-value": "0.4.3"
+=======
+ "arr-union": "^3.1.0",
+ "get-value": "^2.0.6",
+ "is-extendable": "^0.1.1",
+ "set-value": "^0.4.3"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"extend-shallow": {
@@ -10167,7 +14867,11 @@
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-extendable": "0.1.1"
+=======
+ "is-extendable": "^0.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"set-value": {
@@ -10176,10 +14880,17 @@
"integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"extend-shallow": "2.0.1",
"is-extendable": "0.1.1",
"is-plain-object": "2.0.4",
"to-object-path": "0.3.0"
+=======
+ "extend-shallow": "^2.0.1",
+ "is-extendable": "^0.1.1",
+ "is-plain-object": "^2.0.1",
+ "to-object-path": "^0.3.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -10202,7 +14913,11 @@
"integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"unique-slug": "2.0.1"
+=======
+ "unique-slug": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"unique-slug": {
@@ -10211,7 +14926,11 @@
"integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"imurmurhash": "0.1.4"
+=======
+ "imurmurhash": "^0.1.4"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"unpipe": {
@@ -10226,8 +14945,13 @@
"integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-value": "0.3.1",
"isobject": "3.0.1"
+=======
+ "has-value": "^0.3.1",
+ "isobject": "^3.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"has-value": {
@@ -10236,9 +14960,15 @@
"integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"get-value": "2.0.6",
"has-values": "0.1.4",
"isobject": "2.1.0"
+=======
+ "get-value": "^2.0.3",
+ "has-values": "^0.1.4",
+ "isobject": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"isobject": {
@@ -10278,7 +15008,11 @@
"integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"punycode": "2.1.1"
+=======
+ "punycode": "^2.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"urix": {
@@ -10311,8 +15045,13 @@
"integrity": "sha512-B7QYFyvv+fOBqBVeefsxv6koWWtjmHaMFT6KZWti4KRw8YUD/hOU+3AECvXuzyVawIBx3z7zQRejXCDSO5kk1Q==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"loader-utils": "1.1.0",
"mime": "1.3.6"
+=======
+ "loader-utils": "^1.0.2",
+ "mime": "1.3.x"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"mime": {
@@ -10329,8 +15068,13 @@
"integrity": "sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"querystringify": "2.1.0",
"requires-port": "1.0.0"
+=======
+ "querystringify": "^2.0.0",
+ "requires-port": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"use": {
@@ -10378,8 +15122,13 @@
"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"spdx-correct": "3.1.0",
"spdx-expression-parse": "3.0.0"
+=======
+ "spdx-correct": "^3.0.0",
+ "spdx-expression-parse": "^3.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"vary": {
@@ -10394,6 +15143,20 @@
"integrity": "sha512-w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ==",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "verror": {
+ "version": "1.10.0",
+ "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+ "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+ "dev": true,
+ "requires": {
+ "assert-plus": "^1.0.0",
+ "core-util-is": "1.0.2",
+ "extsprintf": "^1.2.0"
+ }
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"vm-browserify": {
"version": "0.0.4",
"resolved": "http://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
@@ -10414,12 +15177,21 @@
"integrity": "sha512-ZezcU71Owm84xVF6gfurBQUGg8WQ+WZGxgDEQu1IHFBZNx7BFZg3L1yHxrCBNNwbwFtE1GuvfJKMtb6Xuwc/Bw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"debug": "3.2.6",
"eslint-scope": "3.7.1",
"eslint-visitor-keys": "1.0.0",
"espree": "3.5.4",
"esquery": "1.0.1",
"lodash": "4.17.11"
+=======
+ "debug": "^3.1.0",
+ "eslint-scope": "^3.7.1",
+ "eslint-visitor-keys": "^1.0.0",
+ "espree": "^3.5.2",
+ "esquery": "^1.0.0",
+ "lodash": "^4.17.4"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"debug": {
@@ -10428,7 +15200,11 @@
"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ms": "2.1.1"
+=======
+ "ms": "^2.1.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"ms": {
@@ -10445,12 +15221,21 @@
"integrity": "sha512-AA86yKZ5uOKz87/q1UpngEXhbRkaYg1b7HMMVRobNV1IVKqZe8oLIzo6iMocVwZXnYitlGwf2k4ZRLOZlS8oPQ==",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "vue-lazyload": {
+ "version": "1.2.6",
+ "resolved": "https://registry.npmjs.org/vue-lazyload/-/vue-lazyload-1.2.6.tgz",
+ "integrity": "sha512-6a61+pzwcfowhLRQiPdmRuJ40n/4fL/sEynu8KQZoCf5RVA0NH0X68vplLY0+lUM8mKNScYomaepV+hdjgnZhg=="
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"vue-loader": {
"version": "13.7.3",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-13.7.3.tgz",
"integrity": "sha512-ACCwbfeC6HjY2pnDii+Zer+MZ6sdOtwvLmDXRK/BoD3WNR551V22R6KEagwHoTRJ0ZlIhpCBkptpCU6+Ri/05w==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"consolidate": "0.14.5",
"hash-sum": "1.0.2",
"loader-utils": "1.1.0",
@@ -10464,6 +15249,21 @@
"vue-hot-reload-api": "2.3.1",
"vue-style-loader": "3.1.2",
"vue-template-es2015-compiler": "1.6.0"
+=======
+ "consolidate": "^0.14.0",
+ "hash-sum": "^1.0.2",
+ "loader-utils": "^1.1.0",
+ "lru-cache": "^4.1.1",
+ "postcss": "^6.0.8",
+ "postcss-load-config": "^1.1.0",
+ "postcss-selector-parser": "^2.0.0",
+ "prettier": "^1.7.0",
+ "resolve": "^1.4.0",
+ "source-map": "^0.6.1",
+ "vue-hot-reload-api": "^2.2.0",
+ "vue-style-loader": "^3.0.0",
+ "vue-template-es2015-compiler": "^1.6.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"cosmiconfig": {
@@ -10472,6 +15272,7 @@
"integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-directory": "0.3.1",
"js-yaml": "3.7.0",
"minimist": "1.2.0",
@@ -10479,6 +15280,15 @@
"os-homedir": "1.0.2",
"parse-json": "2.2.0",
"require-from-string": "1.2.1"
+=======
+ "is-directory": "^0.3.1",
+ "js-yaml": "^3.4.3",
+ "minimist": "^1.2.0",
+ "object-assign": "^4.1.0",
+ "os-homedir": "^1.0.1",
+ "parse-json": "^2.2.0",
+ "require-from-string": "^1.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"minimist": {
@@ -10493,10 +15303,17 @@
"integrity": "sha1-U56a/J3chiASHr+djDZz4M5Q0oo=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"cosmiconfig": "2.2.2",
"object-assign": "4.1.1",
"postcss-load-options": "1.2.0",
"postcss-load-plugins": "2.3.0"
+=======
+ "cosmiconfig": "^2.1.0",
+ "object-assign": "^4.1.0",
+ "postcss-load-options": "^1.2.0",
+ "postcss-load-plugins": "^2.3.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"require-from-string": {
@@ -10518,8 +15335,13 @@
"integrity": "sha512-ICtVdK/p+qXWpdSs2alWtsXt9YnDoYjQe0w5616j9+/EhjoxZkbun34uWgsMFnC1MhrMMwaWiImz3K2jK1Yp2Q==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"hash-sum": "1.0.2",
"loader-utils": "1.1.0"
+=======
+ "hash-sum": "^1.0.2",
+ "loader-utils": "^1.0.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"vue-template-compiler": {
@@ -10528,8 +15350,13 @@
"integrity": "sha512-Vmk5Cv7UcmI99B9nXJEkaK262IQNnHp5rJYo+EwYpe2epTAXqcVyExhV6pk8jTkxQK2vRc8v8KmZBAwdmUZvvw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"de-indent": "1.0.2",
"he": "1.2.0"
+=======
+ "de-indent": "^1.0.2",
+ "he": "^1.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"vue-template-es2015-compiler": {
@@ -10544,9 +15371,15 @@
"integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"chokidar": "2.0.4",
"graceful-fs": "4.1.15",
"neo-async": "2.6.0"
+=======
+ "chokidar": "^2.0.2",
+ "graceful-fs": "^4.1.2",
+ "neo-async": "^2.5.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"wbuf": {
@@ -10555,7 +15388,11 @@
"integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"minimalistic-assert": "1.0.1"
+=======
+ "minimalistic-assert": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"webpack": {
@@ -10564,6 +15401,7 @@
"integrity": "sha512-Sw7MdIIOv/nkzPzee4o0EdvCuPmxT98+vVpIvwtcwcF1Q4SDSNp92vwcKc4REe7NItH9f1S4ra9FuQ7yuYZ8bQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"acorn": "5.7.3",
"acorn-dynamic-import": "2.0.2",
"ajv": "6.6.1",
@@ -10586,6 +15424,30 @@
"watchpack": "1.6.0",
"webpack-sources": "1.3.0",
"yargs": "8.0.2"
+=======
+ "acorn": "^5.0.0",
+ "acorn-dynamic-import": "^2.0.0",
+ "ajv": "^6.1.0",
+ "ajv-keywords": "^3.1.0",
+ "async": "^2.1.2",
+ "enhanced-resolve": "^3.4.0",
+ "escope": "^3.6.0",
+ "interpret": "^1.0.0",
+ "json-loader": "^0.5.4",
+ "json5": "^0.5.1",
+ "loader-runner": "^2.3.0",
+ "loader-utils": "^1.1.0",
+ "memory-fs": "~0.4.1",
+ "mkdirp": "~0.5.0",
+ "node-libs-browser": "^2.0.0",
+ "source-map": "^0.5.3",
+ "supports-color": "^4.2.1",
+ "tapable": "^0.2.7",
+ "uglifyjs-webpack-plugin": "^0.4.6",
+ "watchpack": "^1.4.0",
+ "webpack-sources": "^1.0.1",
+ "yargs": "^8.0.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"ajv": {
@@ -10594,10 +15456,17 @@
"integrity": "sha512-ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"fast-deep-equal": "2.0.1",
"fast-json-stable-stringify": "2.0.0",
"json-schema-traverse": "0.4.1",
"uri-js": "4.2.2"
+=======
+ "fast-deep-equal": "^2.0.1",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.4.1",
+ "uri-js": "^4.2.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"ajv-keywords": {
@@ -10636,7 +15505,11 @@
"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"has-flag": "2.0.0"
+=======
+ "has-flag": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"uglify-js": {
@@ -10645,9 +15518,15 @@
"integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"source-map": "0.5.7",
"uglify-to-browserify": "1.0.2",
"yargs": "3.10.0"
+=======
+ "source-map": "~0.5.1",
+ "uglify-to-browserify": "~1.0.0",
+ "yargs": "~3.10.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"yargs": {
@@ -10656,9 +15535,15 @@
"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"camelcase": "1.2.1",
"cliui": "2.1.0",
"decamelize": "1.2.0",
+=======
+ "camelcase": "^1.0.2",
+ "cliui": "^2.1.0",
+ "decamelize": "^1.0.0",
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"window-size": "0.1.0"
}
}
@@ -10670,9 +15555,15 @@
"integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"source-map": "0.5.7",
"uglify-js": "2.8.29",
"webpack-sources": "1.3.0"
+=======
+ "source-map": "^0.5.6",
+ "uglify-js": "^2.8.29",
+ "webpack-sources": "^1.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -10683,6 +15574,7 @@
"integrity": "sha512-rwxyfecTAxoarCC9VlHlIpfQCmmJ/qWD5bpbjkof+7HrNhTNZIwZITxN6CdlYL2axGmwNUQ+tFgcSOiNXMf/sQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"acorn": "5.7.3",
"bfj-node4": "5.3.1",
"chalk": "2.4.1",
@@ -10695,6 +15587,20 @@
"mkdirp": "0.5.1",
"opener": "1.5.1",
"ws": "4.1.0"
+=======
+ "acorn": "^5.3.0",
+ "bfj-node4": "^5.2.0",
+ "chalk": "^2.3.0",
+ "commander": "^2.13.0",
+ "ejs": "^2.5.7",
+ "express": "^4.16.2",
+ "filesize": "^3.5.11",
+ "gzip-size": "^4.1.0",
+ "lodash": "^4.17.4",
+ "mkdirp": "^0.5.1",
+ "opener": "^1.4.3",
+ "ws": "^4.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"webpack-dev-middleware": {
@@ -10703,11 +15609,19 @@
"integrity": "sha512-FCrqPy1yy/sN6U/SaEZcHKRXGlqU0DUaEBL45jkUYoB8foVb6wCnbIJ1HKIx+qUFTW+3JpVcCJCxZ8VATL4e+A==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"memory-fs": "0.4.1",
"mime": "1.6.0",
"path-is-absolute": "1.0.1",
"range-parser": "1.2.0",
"time-stamp": "2.2.0"
+=======
+ "memory-fs": "~0.4.1",
+ "mime": "^1.5.0",
+ "path-is-absolute": "^1.0.0",
+ "range-parser": "^1.0.3",
+ "time-stamp": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"webpack-dev-server": {
@@ -10717,6 +15631,7 @@
"dev": true,
"requires": {
"ansi-html": "0.0.7",
+<<<<<<< HEAD
"array-includes": "3.0.3",
"bonjour": "3.5.0",
"chokidar": "2.0.4",
@@ -10741,6 +15656,32 @@
"spdy": "3.4.7",
"strip-ansi": "3.0.1",
"supports-color": "5.5.0",
+=======
+ "array-includes": "^3.0.3",
+ "bonjour": "^3.5.0",
+ "chokidar": "^2.0.0",
+ "compression": "^1.5.2",
+ "connect-history-api-fallback": "^1.3.0",
+ "debug": "^3.1.0",
+ "del": "^3.0.0",
+ "express": "^4.16.2",
+ "html-entities": "^1.2.0",
+ "http-proxy-middleware": "~0.17.4",
+ "import-local": "^1.0.0",
+ "internal-ip": "1.2.0",
+ "ip": "^1.1.5",
+ "killable": "^1.0.0",
+ "loglevel": "^1.4.1",
+ "opn": "^5.1.0",
+ "portfinder": "^1.0.9",
+ "selfsigned": "^1.9.1",
+ "serve-index": "^1.7.2",
+ "sockjs": "0.3.19",
+ "sockjs-client": "1.1.5",
+ "spdy": "^3.4.1",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^5.1.0",
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"webpack-dev-middleware": "1.12.2",
"yargs": "6.6.0"
},
@@ -10757,9 +15698,15 @@
"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"string-width": "1.0.2",
"strip-ansi": "3.0.1",
"wrap-ansi": "2.1.0"
+=======
+ "string-width": "^1.0.1",
+ "strip-ansi": "^3.0.1",
+ "wrap-ansi": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"debug": {
@@ -10768,7 +15715,11 @@
"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"ms": "2.1.1"
+=======
+ "ms": "^2.1.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"find-up": {
@@ -10777,8 +15728,13 @@
"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"path-exists": "2.1.0",
"pinkie-promise": "2.0.1"
+=======
+ "path-exists": "^2.0.0",
+ "pinkie-promise": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"is-fullwidth-code-point": {
@@ -10787,7 +15743,11 @@
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"number-is-nan": "1.0.1"
+=======
+ "number-is-nan": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"load-json-file": {
@@ -10796,11 +15756,19 @@
"integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"graceful-fs": "4.1.15",
"parse-json": "2.2.0",
"pify": "2.3.0",
"pinkie-promise": "2.0.1",
"strip-bom": "2.0.0"
+=======
+ "graceful-fs": "^4.1.2",
+ "parse-json": "^2.2.0",
+ "pify": "^2.0.0",
+ "pinkie-promise": "^2.0.0",
+ "strip-bom": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"ms": {
@@ -10815,7 +15783,11 @@
"integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"lcid": "1.0.0"
+=======
+ "lcid": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"path-exists": {
@@ -10824,7 +15796,11 @@
"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"pinkie-promise": "2.0.1"
+=======
+ "pinkie-promise": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"path-type": {
@@ -10833,9 +15809,15 @@
"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"graceful-fs": "4.1.15",
"pify": "2.3.0",
"pinkie-promise": "2.0.1"
+=======
+ "graceful-fs": "^4.1.2",
+ "pify": "^2.0.0",
+ "pinkie-promise": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"pify": {
@@ -10850,9 +15832,15 @@
"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"load-json-file": "1.1.0",
"normalize-package-data": "2.4.0",
"path-type": "1.1.0"
+=======
+ "load-json-file": "^1.0.0",
+ "normalize-package-data": "^2.3.2",
+ "path-type": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"read-pkg-up": {
@@ -10861,8 +15849,13 @@
"integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"find-up": "1.1.2",
"read-pkg": "1.1.0"
+=======
+ "find-up": "^1.0.0",
+ "read-pkg": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"string-width": {
@@ -10871,9 +15864,15 @@
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"code-point-at": "1.1.0",
"is-fullwidth-code-point": "1.0.0",
"strip-ansi": "3.0.1"
+=======
+ "code-point-at": "^1.0.0",
+ "is-fullwidth-code-point": "^1.0.0",
+ "strip-ansi": "^3.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"strip-bom": {
@@ -10882,7 +15881,11 @@
"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"is-utf8": "0.2.1"
+=======
+ "is-utf8": "^0.2.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"which-module": {
@@ -10903,6 +15906,7 @@
"integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"camelcase": "3.0.0",
"cliui": "3.2.0",
"decamelize": "1.2.0",
@@ -10916,6 +15920,21 @@
"which-module": "1.0.0",
"y18n": "3.2.1",
"yargs-parser": "4.2.1"
+=======
+ "camelcase": "^3.0.0",
+ "cliui": "^3.2.0",
+ "decamelize": "^1.1.1",
+ "get-caller-file": "^1.0.1",
+ "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.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"yargs-parser": {
@@ -10924,7 +15943,11 @@
"integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"camelcase": "3.0.0"
+=======
+ "camelcase": "^3.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -10935,7 +15958,11 @@
"integrity": "sha512-sVcM+MMJv6DO0C0GLLltx8mUlGMKXE0zBsuMqZ9jz2X9gsekALw6Rs0cAfTWc97VuWS6NpVUa78959zANnMMLQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"lodash": "4.17.11"
+=======
+ "lodash": "^4.17.5"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"webpack-sources": {
@@ -10944,8 +15971,13 @@
"integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"source-list-map": "2.0.1",
"source-map": "0.6.1"
+=======
+ "source-list-map": "^2.0.0",
+ "source-map": "~0.6.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"websocket-driver": {
@@ -10954,8 +15986,13 @@
"integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"http-parser-js": "0.5.0",
"websocket-extensions": "0.1.3"
+=======
+ "http-parser-js": ">=0.4.0",
+ "websocket-extensions": ">=0.1.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"websocket-extensions": {
@@ -10976,7 +16013,11 @@
"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"isexe": "2.0.0"
+=======
+ "isexe": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"which-module": {
@@ -10985,6 +16026,18 @@
"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
"dev": true
},
+<<<<<<< HEAD
+=======
+ "wide-align": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+ "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+ "dev": true,
+ "requires": {
+ "string-width": "^1.0.2 || 2"
+ }
+ },
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
"window-size": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
@@ -11003,7 +16056,11 @@
"integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"errno": "0.1.7"
+=======
+ "errno": "~0.1.7"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"wrap-ansi": {
@@ -11012,8 +16069,13 @@
"integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"string-width": "1.0.2",
"strip-ansi": "3.0.1"
+=======
+ "string-width": "^1.0.1",
+ "strip-ansi": "^3.0.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"is-fullwidth-code-point": {
@@ -11022,7 +16084,11 @@
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"number-is-nan": "1.0.1"
+=======
+ "number-is-nan": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"string-width": {
@@ -11031,9 +16097,15 @@
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"code-point-at": "1.1.0",
"is-fullwidth-code-point": "1.0.0",
"strip-ansi": "3.0.1"
+=======
+ "code-point-at": "^1.0.0",
+ "is-fullwidth-code-point": "^1.0.0",
+ "strip-ansi": "^3.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -11050,7 +16122,11 @@
"integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"mkdirp": "0.5.1"
+=======
+ "mkdirp": "^0.5.1"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"ws": {
@@ -11059,8 +16135,13 @@
"integrity": "sha512-ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"async-limiter": "1.0.0",
"safe-buffer": "5.1.2"
+=======
+ "async-limiter": "~1.0.0",
+ "safe-buffer": "~5.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"xtend": {
@@ -11075,7 +16156,11 @@
"integrity": "sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==",
"dev": true,
"requires": {
+<<<<<<< HEAD
"cuint": "0.2.2"
+=======
+ "cuint": "^0.2.2"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"y18n": {
@@ -11096,6 +16181,7 @@
"integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"camelcase": "4.1.0",
"cliui": "3.2.0",
"decamelize": "1.2.0",
@@ -11109,6 +16195,21 @@
"which-module": "2.0.0",
"y18n": "3.2.1",
"yargs-parser": "7.0.0"
+=======
+ "camelcase": "^4.1.0",
+ "cliui": "^3.2.0",
+ "decamelize": "^1.1.1",
+ "get-caller-file": "^1.0.1",
+ "os-locale": "^2.0.0",
+ "read-pkg-up": "^2.0.0",
+ "require-directory": "^2.1.1",
+ "require-main-filename": "^1.0.1",
+ "set-blocking": "^2.0.0",
+ "string-width": "^2.0.0",
+ "which-module": "^2.0.0",
+ "y18n": "^3.2.1",
+ "yargs-parser": "^7.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"camelcase": {
@@ -11123,9 +16224,15 @@
"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"string-width": "1.0.2",
"strip-ansi": "3.0.1",
"wrap-ansi": "2.1.0"
+=======
+ "string-width": "^1.0.1",
+ "strip-ansi": "^3.0.1",
+ "wrap-ansi": "^2.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"string-width": {
@@ -11134,9 +16241,15 @@
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"code-point-at": "1.1.0",
"is-fullwidth-code-point": "1.0.0",
"strip-ansi": "3.0.1"
+=======
+ "code-point-at": "^1.0.0",
+ "is-fullwidth-code-point": "^1.0.0",
+ "strip-ansi": "^3.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
}
}
@@ -11147,7 +16260,11 @@
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"number-is-nan": "1.0.1"
+=======
+ "number-is-nan": "^1.0.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
}
},
"y18n": {
@@ -11164,7 +16281,11 @@
"integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
"dev": true,
"requires": {
+<<<<<<< HEAD
"camelcase": "4.1.0"
+=======
+ "camelcase": "^4.1.0"
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
},
"dependencies": {
"camelcase": {
diff --git a/src/App.vue b/src/App.vue
index 4bc2710d0d92f62bca401a88eb0e53f21998210a..d26417ab7151c5b6c434dc51edbdf2e28fda1da6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -59,6 +59,7 @@ html,
body {
height:100%;
overflow: hidden;
+ background: #f2f2f2;
}
.app{
height: 100%;
diff --git a/src/components/BHeader.vue b/src/components/BHeader.vue
index cadc2180f7e8496a155af885b352c06f3db400a2..cd5f5c753e13c081dad1e24e6ed5f42ac0d03a36 100644
--- a/src/components/BHeader.vue
+++ b/src/components/BHeader.vue
@@ -1,4 +1,5 @@
+<<<<<<< HEAD
+=======
+
+>>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c
-