From 9769a9abfd64482f8ec28e7d35952a84f8dcc0f1 Mon Sep 17 00:00:00 2001 From: GTXing <1322755174@qq.com> Date: Sat, 22 Dec 2018 13:34:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=8A=A0=E5=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DangDang | 1 + package-lock.json | 4199 +--------------------------------------- src/pages/Cart.vue | 24 +- src/pages/mutations.js | 55 + 4 files changed, 88 insertions(+), 4191 deletions(-) create mode 160000 DangDang create mode 100644 src/pages/mutations.js diff --git a/DangDang b/DangDang new file mode 160000 index 0000000..7ecb0b7 --- /dev/null +++ b/DangDang @@ -0,0 +1 @@ +Subproject commit 7ecb0b7d0c6e4c952c3b3f0950862828d9f74a02 diff --git a/package-lock.json b/package-lock.json index 83b04fd..3968920 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,17 +20,10 @@ "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": { @@ -82,15 +75,9 @@ "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": { @@ -102,11 +89,7 @@ "@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": { @@ -129,17 +112,10 @@ "@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": { @@ -154,11 +130,7 @@ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { -<<<<<<< HEAD - "ms": "2.1.1" -======= "ms": "^2.1.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "globals": { @@ -181,15 +153,9 @@ "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": { @@ -200,26 +166,19 @@ } } }, -<<<<<<< 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" } }, @@ -235,11 +194,7 @@ "integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=", "dev": true, "requires": { -<<<<<<< HEAD - "acorn": "4.0.13" -======= "acorn": "^4.0.3" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "acorn": { @@ -256,11 +211,7 @@ "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", "dev": true, "requires": { -<<<<<<< HEAD - "acorn": "3.3.0" -======= "acorn": "^3.0.4" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "acorn": { @@ -277,17 +228,10 @@ "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": { @@ -302,15 +246,9 @@ "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": { @@ -319,15 +257,12 @@ "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", @@ -352,11 +287,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { -<<<<<<< HEAD - "color-convert": "1.9.3" -======= "color-convert": "^1.9.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "anymatch": { @@ -365,13 +296,8 @@ "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": { @@ -380,8 +306,6 @@ "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", @@ -392,18 +316,13 @@ "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": { @@ -427,12 +346,7 @@ "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", @@ -446,13 +360,8 @@ "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": { @@ -461,11 +370,7 @@ "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", "dev": true, "requires": { -<<<<<<< HEAD - "array-uniq": "1.0.3" -======= "array-uniq": "^1.0.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "array-uniq": { @@ -486,8 +391,6 @@ "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", "dev": true }, -<<<<<<< HEAD -======= "asn1": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", @@ -497,22 +400,15 @@ "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": { @@ -541,15 +437,12 @@ } } }, -<<<<<<< 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", @@ -562,11 +455,7 @@ "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", "dev": true, "requires": { -<<<<<<< HEAD - "lodash": "4.17.11" -======= "lodash": "^4.17.10" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "async-each": { @@ -575,30 +464,24 @@ "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", @@ -611,16 +494,6 @@ "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", - "num2fraction": "1.2.2", - "postcss": "6.0.23", - "postcss-value-parser": "3.3.1" - } - }, -======= "browserslist": "^2.11.3", "caniuse-lite": "^1.0.30000805", "normalize-range": "^0.1.2", @@ -641,22 +514,24 @@ "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==", "dev": true }, ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c + "axios": { + "version": "0.18.0", + "resolved": "http://registry.npmjs.org/axios/-/axios-0.18.0.tgz", + "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=", + "requires": { + "follow-redirects": "^1.3.0", + "is-buffer": "^1.1.5" + } + }, "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": { @@ -671,19 +546,11 @@ "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": { @@ -700,27 +567,6 @@ "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==", "dev": true, "requires": { -<<<<<<< HEAD - "babel-code-frame": "6.26.0", - "babel-generator": "6.26.1", - "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.6.0", - "debug": "2.6.9", - "json5": "0.5.1", - "lodash": "4.17.11", - "minimatch": "3.0.4", - "path-is-absolute": "1.0.1", - "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", @@ -740,7 +586,6 @@ "private": "^0.1.8", "slash": "^1.0.0", "source-map": "^0.5.7" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "source-map": { @@ -762,11 +607,7 @@ "@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": { @@ -783,16 +624,6 @@ "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", "dev": true, "requires": { -<<<<<<< HEAD - "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.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", @@ -801,7 +632,6 @@ "lodash": "^4.17.4", "source-map": "^0.5.7", "trim-right": "^1.0.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "source-map": { @@ -818,15 +648,9 @@ "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": { @@ -835,15 +659,9 @@ "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": { @@ -852,17 +670,10 @@ "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": { @@ -871,17 +682,10 @@ "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": { @@ -890,15 +694,9 @@ "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": { @@ -907,17 +705,10 @@ "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": { @@ -926,19 +717,11 @@ "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": { @@ -947,13 +730,8 @@ "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": { @@ -962,13 +740,8 @@ "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": { @@ -977,13 +750,8 @@ "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": { @@ -992,15 +760,9 @@ "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": { @@ -1009,19 +771,11 @@ "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": { @@ -1030,21 +784,12 @@ "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": { @@ -1059,13 +804,8 @@ "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": { @@ -1074,15 +814,9 @@ "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": { @@ -1091,11 +825,7 @@ "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", "dev": true, "requires": { -<<<<<<< HEAD - "babel-runtime": "6.26.0" -======= "babel-runtime": "^6.22.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "babel-plugin-check-es2015-constants": { @@ -1104,11 +834,7 @@ "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": { @@ -1171,15 +897,9 @@ "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": { @@ -1188,15 +908,9 @@ "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": { @@ -1205,17 +919,10 @@ "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": { @@ -1224,19 +931,11 @@ "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": { @@ -1245,11 +944,7 @@ "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": { @@ -1258,11 +953,7 @@ "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=", "dev": true, "requires": { -<<<<<<< HEAD - "babel-runtime": "6.26.0" -======= "babel-runtime": "^6.22.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "babel-plugin-transform-es2015-block-scoping": { @@ -1271,19 +962,11 @@ "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": { @@ -1292,17 +975,6 @@ "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", - "babel-helper-replace-supers": "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-define-map": "^6.24.1", "babel-helper-function-name": "^6.24.1", "babel-helper-optimise-call-expression": "^6.24.1", @@ -1312,7 +984,6 @@ "babel-template": "^6.24.1", "babel-traverse": "^6.24.1", "babel-types": "^6.24.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "babel-plugin-transform-es2015-computed-properties": { @@ -1321,13 +992,8 @@ "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": { @@ -1336,11 +1002,7 @@ "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": { @@ -1349,13 +1011,8 @@ "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": { @@ -1364,11 +1021,7 @@ "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": { @@ -1377,15 +1030,9 @@ "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": { @@ -1394,11 +1041,7 @@ "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=", "dev": true, "requires": { -<<<<<<< HEAD - "babel-runtime": "6.26.0" -======= "babel-runtime": "^6.22.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "babel-plugin-transform-es2015-modules-amd": { @@ -1407,15 +1050,9 @@ "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": { @@ -1424,17 +1061,10 @@ "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": { @@ -1443,15 +1073,9 @@ "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": { @@ -1460,15 +1084,9 @@ "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": { @@ -1477,13 +1095,8 @@ "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": { @@ -1492,21 +1105,12 @@ "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": { @@ -1515,13 +1119,8 @@ "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": { @@ -1530,11 +1129,7 @@ "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": { @@ -1543,15 +1138,9 @@ "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": { @@ -1560,11 +1149,7 @@ "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": { @@ -1573,11 +1158,7 @@ "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": { @@ -1586,15 +1167,9 @@ "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": { @@ -1603,15 +1178,9 @@ "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": { @@ -1620,13 +1189,8 @@ "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": { @@ -1635,11 +1199,7 @@ "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=", "dev": true, "requires": { -<<<<<<< HEAD - "regenerator-transform": "0.10.1" -======= "regenerator-transform": "^0.10.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "babel-plugin-transform-runtime": { @@ -1648,11 +1208,7 @@ "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=", "dev": true, "requires": { -<<<<<<< HEAD - "babel-runtime": "6.26.0" -======= "babel-runtime": "^6.22.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "babel-plugin-transform-strict-mode": { @@ -1661,13 +1217,8 @@ "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": { @@ -1676,11 +1227,7 @@ "integrity": "sha512-W39X07/n3oJMQd8tALBO+440NraGSF//Lo1ydd/9Nme3+QiRGFBb1Q39T9iixh0jZPPbfv3so18tNoIgLatymw==", "dev": true, "requires": { -<<<<<<< HEAD - "esutils": "2.0.2" -======= "esutils": "^2.0.2" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "babel-preset-env": { @@ -1689,38 +1236,6 @@ "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", - "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.26.0", - "babel-plugin-transform-es2015-classes": "6.24.1", - "babel-plugin-transform-es2015-computed-properties": "6.24.1", - "babel-plugin-transform-es2015-destructuring": "6.23.0", - "babel-plugin-transform-es2015-duplicate-keys": "6.24.1", - "babel-plugin-transform-es2015-for-of": "6.23.0", - "babel-plugin-transform-es2015-function-name": "6.24.1", - "babel-plugin-transform-es2015-literals": "6.22.0", - "babel-plugin-transform-es2015-modules-amd": "6.24.1", - "babel-plugin-transform-es2015-modules-commonjs": "6.26.2", - "babel-plugin-transform-es2015-modules-systemjs": "6.24.1", - "babel-plugin-transform-es2015-modules-umd": "6.24.1", - "babel-plugin-transform-es2015-object-super": "6.24.1", - "babel-plugin-transform-es2015-parameters": "6.24.1", - "babel-plugin-transform-es2015-shorthand-properties": "6.24.1", - "babel-plugin-transform-es2015-spread": "6.22.0", - "babel-plugin-transform-es2015-sticky-regex": "6.24.1", - "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.24.1", - "babel-plugin-transform-exponentiation-operator": "6.24.1", - "babel-plugin-transform-regenerator": "6.26.0", - "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", @@ -1751,7 +1266,6 @@ "browserslist": "^3.2.6", "invariant": "^2.2.2", "semver": "^5.3.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "browserslist": { @@ -1760,13 +1274,8 @@ "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 } } } @@ -1777,17 +1286,10 @@ "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": { @@ -1796,19 +1298,11 @@ "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": { @@ -1817,15 +1311,6 @@ "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", "dev": true, "requires": { -<<<<<<< HEAD - "babel-core": "6.26.3", - "babel-runtime": "6.26.0", - "core-js": "2.6.0", - "home-or-tmp": "2.0.0", - "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", @@ -1833,7 +1318,6 @@ "lodash": "^4.17.4", "mkdirp": "^0.5.1", "source-map-support": "^0.4.15" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "babel-runtime": { @@ -1842,13 +1326,8 @@ "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": { @@ -1857,19 +1336,11 @@ "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": { @@ -1878,17 +1349,6 @@ "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", "dev": true, "requires": { -<<<<<<< HEAD - "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.9", - "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", @@ -1898,7 +1358,6 @@ "globals": "^9.18.0", "invariant": "^2.2.2", "lodash": "^4.17.4" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "babel-types": { @@ -1907,17 +1366,10 @@ "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": { @@ -1938,15 +1390,6 @@ "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", "dev": true, "requires": { -<<<<<<< HEAD - "cache-base": "1.0.1", - "class-utils": "0.3.6", - "component-emitter": "1.2.1", - "define-property": "1.0.0", - "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", @@ -1954,7 +1397,6 @@ "isobject": "^3.0.1", "mixin-deep": "^1.2.0", "pascalcase": "^0.1.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "define-property": { @@ -1963,11 +1405,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { -<<<<<<< HEAD - "is-descriptor": "1.0.2" -======= "is-descriptor": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "is-accessor-descriptor": { @@ -1976,11 +1414,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { -<<<<<<< HEAD - "kind-of": "6.0.2" -======= "kind-of": "^6.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "is-data-descriptor": { @@ -1989,11 +1423,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { -<<<<<<< HEAD - "kind-of": "6.0.2" -======= "kind-of": "^6.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "is-descriptor": { @@ -2002,15 +1432,9 @@ "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": { @@ -2033,8 +1457,6 @@ "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", @@ -2044,22 +1466,15 @@ "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": { @@ -2074,8 +1489,6 @@ "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", @@ -2085,7 +1498,6 @@ "inherits": "~2.0.0" } }, ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c "bluebird": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz", @@ -2105,17 +1517,6 @@ "dev": true, "requires": { "bytes": "3.0.0", -<<<<<<< HEAD - "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" -======= "content-type": "~1.0.4", "debug": "2.6.9", "depd": "~1.1.2", @@ -2125,7 +1526,6 @@ "qs": "6.5.2", "raw-body": "2.3.3", "type-is": "~1.6.16" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "iconv-lite": { @@ -2134,11 +1534,7 @@ "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", "dev": true, "requires": { -<<<<<<< HEAD - "safer-buffer": "2.1.2" -======= "safer-buffer": ">= 2.1.2 < 3" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -2149,21 +1545,12 @@ "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": { @@ -2186,11 +1573,7 @@ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "requires": { -<<<<<<< HEAD - "balanced-match": "1.0.0", -======= "balanced-match": "^1.0.0", ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c "concat-map": "0.0.1" } }, @@ -2200,18 +1583,6 @@ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, "requires": { -<<<<<<< HEAD - "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.3", - "snapdragon": "0.8.2", - "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", @@ -2222,7 +1593,6 @@ "snapdragon-node": "^2.0.1", "split-string": "^3.0.2", "to-regex": "^3.0.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "extend-shallow": { @@ -2231,11 +1601,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { -<<<<<<< HEAD - "is-extendable": "0.1.1" -======= "is-extendable": "^0.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -2252,21 +1618,12 @@ "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": { @@ -2275,15 +1632,9 @@ "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": { @@ -2292,17 +1643,10 @@ "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": { @@ -2311,13 +1655,8 @@ "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": { @@ -2326,15 +1665,6 @@ "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", "dev": true, "requires": { -<<<<<<< HEAD - "bn.js": "4.11.8", - "browserify-rsa": "4.0.1", - "create-hash": "1.2.0", - "create-hmac": "1.1.7", - "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", @@ -2342,7 +1672,6 @@ "elliptic": "^6.0.0", "inherits": "^2.0.1", "parse-asn1": "^5.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "browserify-zlib": { @@ -2351,11 +1680,7 @@ "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", "dev": true, "requires": { -<<<<<<< HEAD - "pako": "1.0.7" -======= "pako": "~1.0.5" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "browserslist": { @@ -2364,13 +1689,8 @@ "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": { @@ -2379,15 +1699,9 @@ "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": { @@ -2432,21 +1746,6 @@ "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==", "dev": true, "requires": { -<<<<<<< HEAD - "bluebird": "3.5.3", - "chownr": "1.1.1", - "glob": "7.1.3", - "graceful-fs": "4.1.15", - "lru-cache": "4.1.5", - "mississippi": "2.0.0", - "mkdirp": "0.5.1", - "move-concurrently": "1.0.1", - "promise-inflight": "1.0.1", - "rimraf": "2.6.2", - "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", @@ -2460,7 +1759,6 @@ "ssri": "^5.2.4", "unique-filename": "^1.1.0", "y18n": "^4.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "cache-base": { @@ -2469,17 +1767,6 @@ "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", "dev": true, "requires": { -<<<<<<< HEAD - "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" -======= "collection-visit": "^1.0.0", "component-emitter": "^1.2.1", "get-value": "^2.0.6", @@ -2489,7 +1776,6 @@ "to-object-path": "^0.3.0", "union-value": "^1.0.0", "unset-value": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "caller-path": { @@ -2498,11 +1784,7 @@ "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", "dev": true, "requires": { -<<<<<<< HEAD - "callsites": "0.2.0" -======= "callsites": "^0.2.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "callsites": { @@ -2517,13 +1799,8 @@ "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": { @@ -2538,13 +1815,8 @@ "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": { @@ -2561,17 +1833,10 @@ "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": { @@ -2580,13 +1845,8 @@ "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 } } } @@ -2603,28 +1863,20 @@ "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": { @@ -2633,15 +1885,9 @@ "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": { @@ -2662,20 +1908,6 @@ "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==", "dev": true, "requires": { -<<<<<<< HEAD - "anymatch": "2.0.0", - "async-each": "1.0.1", - "braces": "2.3.2", - "glob-parent": "3.1.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "4.0.0", - "lodash.debounce": "4.0.8", - "normalize-path": "2.1.1", - "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", @@ -2688,7 +1920,6 @@ "path-is-absolute": "^1.0.0", "readdirp": "^2.0.0", "upath": "^1.0.5" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "chownr": { @@ -2703,13 +1934,8 @@ "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": { @@ -2724,11 +1950,7 @@ "integrity": "sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==", "dev": true, "requires": { -<<<<<<< HEAD - "chalk": "1.1.3" -======= "chalk": "^1.1.3" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "ansi-styles": { @@ -2743,19 +1965,11 @@ "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": { @@ -2772,17 +1986,10 @@ "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": { @@ -2791,11 +1998,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { -<<<<<<< HEAD - "is-descriptor": "0.1.6" -======= "is-descriptor": "^0.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -2806,11 +2009,7 @@ "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==", "dev": true, "requires": { -<<<<<<< HEAD - "source-map": "0.6.1" -======= "source-map": "~0.6.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "cli-cursor": { @@ -2819,11 +2018,7 @@ "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", "dev": true, "requires": { -<<<<<<< HEAD - "restore-cursor": "2.0.0" -======= "restore-cursor": "^2.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "cli-spinners": { @@ -2844,13 +2039,8 @@ "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": { @@ -2868,8 +2058,6 @@ "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", @@ -2899,7 +2087,6 @@ } } }, ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", @@ -2912,11 +2099,7 @@ "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=", "dev": true, "requires": { -<<<<<<< HEAD - "q": "1.5.1" -======= "q": "^1.1.2" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "coalescy": { @@ -2937,13 +2120,8 @@ "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": { @@ -2952,15 +2130,9 @@ "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": { @@ -2984,11 +2156,7 @@ "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=", "dev": true, "requires": { -<<<<<<< HEAD - "color-name": "1.1.3" -======= "color-name": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "colormin": { @@ -2997,15 +2165,9 @@ "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": { @@ -3014,8 +2176,6 @@ "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", @@ -3025,7 +2185,6 @@ "delayed-stream": "~1.0.0" } }, ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c "commander": { "version": "2.17.1", "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", @@ -3050,11 +2209,7 @@ "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": { @@ -3063,15 +2218,6 @@ "integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==", "dev": true, "requires": { -<<<<<<< HEAD - "accepts": "1.3.5", - "bytes": "3.0.0", - "compressible": "2.0.15", - "debug": "2.6.9", - "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", @@ -3079,7 +2225,6 @@ "on-headers": "~1.0.1", "safe-buffer": "5.1.2", "vary": "~1.1.2" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "concat-map": { @@ -3094,17 +2239,10 @@ "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": { @@ -3119,11 +2257,6 @@ "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", "dev": true, "requires": { -<<<<<<< HEAD - "date-now": "0.1.4" - } - }, -======= "date-now": "^0.1.4" } }, @@ -3133,18 +2266,13 @@ "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": { @@ -3177,11 +2305,7 @@ "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==", "dev": true, "requires": { -<<<<<<< HEAD - "safe-buffer": "5.1.2" -======= "safe-buffer": "~5.1.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "cookie": { @@ -3202,21 +2326,12 @@ "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": { @@ -3231,16 +2346,6 @@ "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", - "is-glob": "4.0.0", - "loader-utils": "1.1.0", - "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", @@ -3249,7 +2354,6 @@ "minimatch": "^3.0.4", "p-limit": "^1.0.0", "serialize-javascript": "^1.4.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "core-js": { @@ -3270,17 +2374,10 @@ "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": { @@ -3295,13 +2392,8 @@ "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": { @@ -3310,13 +2402,8 @@ "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 } } } @@ -3327,13 +2414,8 @@ "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": { @@ -3342,19 +2424,11 @@ "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": { @@ -3363,21 +2437,12 @@ "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": { @@ -3386,15 +2451,9 @@ "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": { @@ -3403,19 +2462,6 @@ "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", - "create-hash": "1.2.0", - "create-hmac": "1.1.7", - "diffie-hellman": "5.0.3", - "inherits": "2.0.3", - "pbkdf2": "3.0.17", - "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", @@ -3427,7 +2473,6 @@ "public-encrypt": "^4.0.0", "randombytes": "^2.0.0", "randomfill": "^1.0.3" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "css-color-names": { @@ -3442,22 +2487,6 @@ "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", - "icss-utils": "2.1.0", - "loader-utils": "1.1.0", - "lodash.camelcase": "4.3.0", - "object-assign": "4.1.1", - "postcss": "5.2.18", - "postcss-modules-extract-imports": "1.2.1", - "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.1", - "source-list-map": "2.0.1" -======= "babel-code-frame": "^6.26.0", "css-selector-tokenizer": "^0.7.0", "cssnano": "^3.10.0", @@ -3472,7 +2501,6 @@ "postcss-modules-values": "^1.3.0", "postcss-value-parser": "^3.3.0", "source-list-map": "^2.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "ansi-styles": { @@ -3487,19 +2515,11 @@ "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": { @@ -3522,17 +2542,10 @@ "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": { @@ -3547,11 +2560,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "1.0.0" -======= "has-flag": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -3562,17 +2571,10 @@ "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": { @@ -3581,15 +2583,9 @@ "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": { @@ -3598,15 +2594,9 @@ "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 } } } @@ -3629,40 +2619,6 @@ "integrity": "sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=", "dev": true, "requires": { -<<<<<<< HEAD - "autoprefixer": "6.7.7", - "decamelize": "1.2.0", - "defined": "1.0.0", - "has": "1.0.3", - "object-assign": "4.1.1", - "postcss": "5.2.18", - "postcss-calc": "5.3.1", - "postcss-colormin": "2.2.2", - "postcss-convert-values": "2.6.1", - "postcss-discard-comments": "2.0.4", - "postcss-discard-duplicates": "2.1.0", - "postcss-discard-empty": "2.1.0", - "postcss-discard-overridden": "0.1.1", - "postcss-discard-unused": "2.2.3", - "postcss-filter-plugins": "2.0.3", - "postcss-merge-idents": "2.1.7", - "postcss-merge-longhand": "2.0.2", - "postcss-merge-rules": "2.1.2", - "postcss-minify-font-values": "1.0.5", - "postcss-minify-gradients": "1.0.5", - "postcss-minify-params": "1.2.2", - "postcss-minify-selectors": "2.1.1", - "postcss-normalize-charset": "1.1.1", - "postcss-normalize-url": "3.0.8", - "postcss-ordered-values": "2.2.3", - "postcss-reduce-idents": "2.4.0", - "postcss-reduce-initial": "1.0.1", - "postcss-reduce-transforms": "1.0.4", - "postcss-svgo": "2.1.6", - "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", @@ -3695,7 +2651,6 @@ "postcss-unique-selectors": "^2.0.2", "postcss-value-parser": "^3.2.3", "postcss-zindex": "^2.0.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "ansi-styles": { @@ -3710,21 +2665,12 @@ "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": { @@ -3733,13 +2679,8 @@ "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": { @@ -3748,19 +2689,11 @@ "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": { @@ -3783,17 +2716,10 @@ "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": { @@ -3808,11 +2734,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "1.0.0" -======= "has-flag": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -3823,13 +2745,8 @@ "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": { @@ -3852,11 +2769,7 @@ "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "dev": true, "requires": { -<<<<<<< HEAD - "array-find-index": "1.0.2" -======= "array-find-index": "^1.0.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "cyclist": { @@ -3871,9 +2784,6 @@ "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "dev": true, "requires": { -<<<<<<< HEAD - "es5-ext": "0.10.46" -======= "es5-ext": "^0.10.9" } }, @@ -3884,7 +2794,6 @@ "dev": true, "requires": { "assert-plus": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "date-now": { @@ -3938,11 +2847,7 @@ "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", "dev": true, "requires": { -<<<<<<< HEAD - "object-keys": "1.0.12" -======= "object-keys": "^1.0.12" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "define-property": { @@ -3951,13 +2856,8 @@ "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": { @@ -3966,11 +2866,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { -<<<<<<< HEAD - "kind-of": "6.0.2" -======= "kind-of": "^6.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "is-data-descriptor": { @@ -3979,11 +2875,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { -<<<<<<< HEAD - "kind-of": "6.0.2" -======= "kind-of": "^6.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "is-descriptor": { @@ -3992,15 +2884,9 @@ "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": { @@ -4023,21 +2909,12 @@ "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": { @@ -4046,19 +2923,11 @@ "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": { @@ -4071,8 +2940,6 @@ } } }, -<<<<<<< HEAD -======= "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -4085,7 +2952,6 @@ "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", "dev": true }, ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c "depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -4098,13 +2964,8 @@ "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": { @@ -4119,11 +2980,7 @@ "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", "dev": true, "requires": { -<<<<<<< HEAD - "repeating": "2.0.1" -======= "repeating": "^2.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "detect-node": { @@ -4138,15 +2995,9 @@ "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": { @@ -4155,13 +3006,8 @@ "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": { @@ -4176,13 +3022,8 @@ "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": { @@ -4191,11 +3032,7 @@ "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=", "dev": true, "requires": { -<<<<<<< HEAD - "buffer-indexof": "1.1.1" -======= "buffer-indexof": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "doctrine": { @@ -4204,11 +3041,7 @@ "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", "dev": true, "requires": { -<<<<<<< HEAD - "esutils": "2.0.2" -======= "esutils": "^2.0.2" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "dom-converter": { @@ -4217,11 +3050,7 @@ "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==", "dev": true, "requires": { -<<<<<<< HEAD - "utila": "0.4.0" -======= "utila": "~0.4" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "dom-serializer": { @@ -4230,13 +3059,8 @@ "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": { @@ -4265,11 +3089,7 @@ "integrity": "sha1-0mRvXlf2w7qxHPbLBdPArPdBJZQ=", "dev": true, "requires": { -<<<<<<< HEAD - "domelementtype": "1.3.1" -======= "domelementtype": "1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "domutils": { @@ -4278,13 +3098,8 @@ "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", "dev": true, "requires": { -<<<<<<< HEAD - "dom-serializer": "0.1.0", - "domelementtype": "1.3.1" -======= "dom-serializer": "0", "domelementtype": "1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "duplexer": { @@ -4299,12 +3114,6 @@ "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", @@ -4319,7 +3128,6 @@ "requires": { "jsbn": "~0.1.0", "safer-buffer": "^2.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "ee-first": { @@ -4346,15 +3154,6 @@ "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==", "dev": true, "requires": { -<<<<<<< HEAD - "bn.js": "4.11.8", - "brorand": "1.1.0", - "hash.js": "1.1.7", - "hmac-drbg": "1.0.1", - "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", @@ -4362,7 +3161,6 @@ "inherits": "^2.0.1", "minimalistic-assert": "^1.0.0", "minimalistic-crypto-utils": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "emojis-list": { @@ -4383,11 +3181,7 @@ "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", "dev": true, "requires": { -<<<<<<< HEAD - "once": "1.4.0" -======= "once": "^1.4.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "enhanced-resolve": { @@ -4396,17 +3190,10 @@ "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": { @@ -4421,11 +3208,7 @@ "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", "dev": true, "requires": { -<<<<<<< HEAD - "prr": "1.0.1" -======= "prr": "~1.0.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "error-ex": { @@ -4434,11 +3217,7 @@ "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, "requires": { -<<<<<<< HEAD - "is-arrayish": "0.2.1" -======= "is-arrayish": "^0.2.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "error-stack-parser": { @@ -4447,11 +3226,7 @@ "integrity": "sha512-E1fPutRDdIj/hohG0UpT5mayXNCxXP9d+snxFsPU9X0XgccOumKraa3juDMwTUyi7+Bu5+mCGagjg4IYeNbOdw==", "dev": true, "requires": { -<<<<<<< HEAD - "stackframe": "1.0.4" -======= "stackframe": "^1.0.4" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "es-abstract": { @@ -4460,19 +3235,11 @@ "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": { @@ -4481,15 +3248,9 @@ "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": { @@ -4498,15 +3259,9 @@ "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": { @@ -4515,15 +3270,9 @@ "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": { @@ -4532,21 +3281,12 @@ "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": { @@ -4555,19 +3295,11 @@ "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": { @@ -4576,13 +3308,8 @@ "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": { @@ -4591,17 +3318,10 @@ "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": { @@ -4622,17 +3342,10 @@ "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": { @@ -4641,46 +3354,6 @@ "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==", "dev": true, "requires": { -<<<<<<< HEAD - "ajv": "5.5.2", - "babel-code-frame": "6.26.0", - "chalk": "2.4.1", - "concat-stream": "1.6.2", - "cross-spawn": "5.1.0", - "debug": "3.2.6", - "doctrine": "2.1.0", - "eslint-scope": "3.7.1", - "eslint-visitor-keys": "1.0.0", - "espree": "3.5.4", - "esquery": "1.0.1", - "esutils": "2.0.2", - "file-entry-cache": "2.0.0", - "functional-red-black-tree": "1.0.1", - "glob": "7.1.3", - "globals": "11.9.0", - "ignore": "3.3.10", - "imurmurhash": "0.1.4", - "inquirer": "3.3.0", - "is-resolvable": "1.1.0", - "js-yaml": "3.12.0", - "json-stable-stringify-without-jsonify": "1.0.1", - "levn": "0.3.0", - "lodash": "4.17.11", - "minimatch": "3.0.4", - "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.3", - "regexpp": "1.1.0", - "require-uncached": "1.0.3", - "semver": "5.6.0", - "strip-ansi": "4.0.0", - "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", @@ -4719,7 +3392,6 @@ "strip-json-comments": "~2.0.1", "table": "4.0.2", "text-table": "~0.2.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "ansi-regex": { @@ -4734,11 +3406,7 @@ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { -<<<<<<< HEAD - "ms": "2.1.1" -======= "ms": "^2.1.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "esprima": { @@ -4759,13 +3427,8 @@ "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": { @@ -4780,11 +3443,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { -<<<<<<< HEAD - "ansi-regex": "3.0.0" -======= "ansi-regex": "^3.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -4801,19 +3460,11 @@ "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": { @@ -4828,19 +3479,11 @@ "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": { @@ -4863,13 +3506,8 @@ "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": { @@ -4878,19 +3516,11 @@ "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": { @@ -4899,13 +3529,8 @@ "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": { @@ -4914,13 +3539,8 @@ "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": { @@ -4929,11 +3549,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { -<<<<<<< HEAD - "pinkie-promise": "2.0.1" -======= "pinkie-promise": "^2.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "pkg-dir": { @@ -4942,11 +3558,7 @@ "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=", "dev": true, "requires": { -<<<<<<< HEAD - "find-up": "1.1.2" -======= "find-up": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -4957,18 +3569,6 @@ "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", - "eslint-import-resolver-node": "0.3.2", - "eslint-module-utils": "2.2.0", - "has": "1.0.3", - "lodash": "4.17.11", - "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", @@ -4979,7 +3579,6 @@ "minimatch": "^3.0.3", "read-pkg-up": "^2.0.0", "resolve": "^1.6.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "doctrine": { @@ -4988,13 +3587,8 @@ "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=", "dev": true, "requires": { -<<<<<<< HEAD - "esutils": "2.0.2", - "isarray": "1.0.0" -======= "esutils": "^2.0.2", "isarray": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -5005,15 +3599,9 @@ "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": { @@ -5043,11 +3631,7 @@ "integrity": "sha512-esETKhVMI7Vdli70Wt4bvAwnZBJeM0pxVX9Yb0wWKxdCJc2EADalVYK/q2FzMw8oKN0wPMdqVCKS8kmR89recA==", "dev": true, "requires": { -<<<<<<< HEAD - "vue-eslint-parser": "2.0.3" -======= "vue-eslint-parser": "^2.0.3" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "eslint-scope": { @@ -5056,13 +3640,8 @@ "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": { @@ -5077,13 +3656,8 @@ "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": { @@ -5098,11 +3672,7 @@ "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==", "dev": true, "requires": { -<<<<<<< HEAD - "estraverse": "4.2.0" -======= "estraverse": "^4.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "esrecurse": { @@ -5111,11 +3681,7 @@ "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", "dev": true, "requires": { -<<<<<<< HEAD - "estraverse": "4.2.0" -======= "estraverse": "^4.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "estraverse": { @@ -5142,13 +3708,8 @@ "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": { @@ -5169,11 +3730,7 @@ "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=", "dev": true, "requires": { -<<<<<<< HEAD - "original": "1.0.2" -======= "original": ">=0.0.5" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "evp_bytestokey": { @@ -5182,13 +3739,8 @@ "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": { @@ -5197,15 +3749,6 @@ "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", "dev": true, "requires": { -<<<<<<< HEAD - "cross-spawn": "5.1.0", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "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", @@ -5213,7 +3756,6 @@ "p-finally": "^1.0.0", "signal-exit": "^3.0.0", "strip-eof": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "expand-brackets": { @@ -5222,15 +3764,6 @@ "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "dev": true, "requires": { -<<<<<<< HEAD - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "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", @@ -5238,7 +3771,6 @@ "regex-not": "^1.0.0", "snapdragon": "^0.8.1", "to-regex": "^3.0.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "define-property": { @@ -5247,11 +3779,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { -<<<<<<< HEAD - "is-descriptor": "0.1.6" -======= "is-descriptor": "^0.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "extend-shallow": { @@ -5260,11 +3788,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { -<<<<<<< HEAD - "is-extendable": "0.1.1" -======= "is-extendable": "^0.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -5275,11 +3799,7 @@ "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", "dev": true, "requires": { -<<<<<<< HEAD - "fill-range": "2.2.4" -======= "fill-range": "^2.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "fill-range": { @@ -5288,19 +3808,11 @@ "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": { @@ -5309,11 +3821,7 @@ "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", "dev": true, "requires": { -<<<<<<< HEAD - "kind-of": "3.2.2" -======= "kind-of": "^3.0.2" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "isobject": { @@ -5333,30 +3841,6 @@ "integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==", "dev": true, "requires": { -<<<<<<< HEAD - "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", -======= "accepts": "~1.3.5", "array-flatten": "1.1.1", "body-parser": "1.18.3", @@ -5379,22 +3863,14 @@ "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": { @@ -5409,13 +3885,8 @@ "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": { @@ -5424,11 +3895,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { -<<<<<<< HEAD - "is-plain-object": "2.0.4" -======= "is-plain-object": "^2.0.4" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -5439,15 +3906,9 @@ "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": { @@ -5456,16 +3917,6 @@ "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", "dev": true, "requires": { -<<<<<<< HEAD - "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.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", @@ -5474,7 +3925,6 @@ "regex-not": "^1.0.0", "snapdragon": "^0.8.1", "to-regex": "^3.0.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "define-property": { @@ -5483,11 +3933,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { -<<<<<<< HEAD - "is-descriptor": "1.0.2" -======= "is-descriptor": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "extend-shallow": { @@ -5496,11 +3942,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { -<<<<<<< HEAD - "is-extendable": "0.1.1" -======= "is-extendable": "^0.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "is-accessor-descriptor": { @@ -5509,11 +3951,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { -<<<<<<< HEAD - "kind-of": "6.0.2" -======= "kind-of": "^6.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "is-data-descriptor": { @@ -5522,11 +3960,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { -<<<<<<< HEAD - "kind-of": "6.0.2" -======= "kind-of": "^6.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "is-descriptor": { @@ -5535,15 +3969,9 @@ "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": { @@ -5560,14 +3988,6 @@ "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", @@ -5580,7 +4000,6 @@ "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", @@ -5611,11 +4030,7 @@ "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", "dev": true, "requires": { -<<<<<<< HEAD - "websocket-driver": "0.7.0" -======= "websocket-driver": ">=0.5.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "figures": { @@ -5624,11 +4039,7 @@ "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", "dev": true, "requires": { -<<<<<<< HEAD - "escape-string-regexp": "1.0.5" -======= "escape-string-regexp": "^1.0.5" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "file-entry-cache": { @@ -5637,13 +4048,8 @@ "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": { @@ -5652,13 +4058,8 @@ "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": { @@ -5667,17 +4068,10 @@ "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": { @@ -5704,13 +4098,8 @@ "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 } } } @@ -5733,17 +4122,10 @@ "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": { @@ -5752,11 +4134,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { -<<<<<<< HEAD - "is-extendable": "0.1.1" -======= "is-extendable": "^0.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -5768,21 +4146,12 @@ "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": { @@ -5791,15 +4160,9 @@ "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": { @@ -5808,11 +4171,7 @@ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { -<<<<<<< HEAD - "locate-path": "2.0.0" -======= "locate-path": "^2.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "flat-cache": { @@ -5821,17 +4180,10 @@ "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": { @@ -5846,33 +4198,22 @@ "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": { "version": "1.5.10", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", - "dev": true, "requires": { -<<<<<<< HEAD - "debug": "3.1.0" -======= "debug": "=3.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "debug": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, "requires": { "ms": "2.0.0" } @@ -5891,9 +4232,6 @@ "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", "dev": true, "requires": { -<<<<<<< HEAD - "for-in": "1.0.2" -======= "for-in": "^1.0.1" } }, @@ -5912,7 +4250,6 @@ "asynckit": "^0.4.0", "combined-stream": "^1.0.6", "mime-types": "^2.1.12" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "forwarded": { @@ -5927,11 +4264,7 @@ "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", "dev": true, "requires": { -<<<<<<< HEAD - "map-cache": "0.2.2" -======= "map-cache": "^0.2.2" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "fresh": { @@ -5946,15 +4279,9 @@ "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": { @@ -5969,19 +4296,11 @@ "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": { @@ -5998,13 +4317,8 @@ "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": { @@ -6013,17 +4327,10 @@ "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": { @@ -6032,8 +4339,6 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true }, -<<<<<<< HEAD -======= "fstream": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", @@ -6046,7 +4351,6 @@ "rimraf": "2" } }, ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -6059,8 +4363,6 @@ "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", "dev": true }, -<<<<<<< HEAD -======= "gauge": { "version": "2.7.4", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", @@ -6108,7 +4410,6 @@ "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", @@ -6133,8 +4434,6 @@ "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", "dev": true }, -<<<<<<< HEAD -======= "getpass": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", @@ -6144,28 +4443,18 @@ "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": { @@ -6174,13 +4463,8 @@ "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": { @@ -6189,11 +4473,7 @@ "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", "dev": true, "requires": { -<<<<<<< HEAD - "is-glob": "2.0.1" -======= "is-glob": "^2.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "is-extglob": { @@ -6208,11 +4488,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { -<<<<<<< HEAD - "is-extglob": "1.0.0" -======= "is-extglob": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -6223,13 +4499,8 @@ "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": { @@ -6238,11 +4509,7 @@ "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "dev": true, "requires": { -<<<<<<< HEAD - "is-extglob": "2.1.1" -======= "is-extglob": "^2.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -6259,14 +4526,6 @@ "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", @@ -6284,7 +4543,6 @@ "glob": "~7.1.1", "lodash": "~4.17.10", "minimatch": "~3.0.2" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "graceful-fs": { @@ -6305,13 +4563,8 @@ "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": { @@ -6320,8 +4573,6 @@ "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", @@ -6364,18 +4615,13 @@ } } }, ->>>>>>> 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": { @@ -6384,11 +4630,7 @@ "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "dev": true, "requires": { -<<<<<<< HEAD - "ansi-regex": "2.1.1" -======= "ansi-regex": "^2.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "has-flag": { @@ -6403,30 +4645,21 @@ "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": { @@ -6435,13 +4668,8 @@ "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": { @@ -6450,11 +4678,7 @@ "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "dev": true, "requires": { -<<<<<<< HEAD - "is-buffer": "1.1.6" -======= "is-buffer": "^1.1.5" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -6465,13 +4689,8 @@ "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": { @@ -6486,13 +4705,8 @@ "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": { @@ -6507,15 +4721,9 @@ "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": { @@ -6524,13 +4732,8 @@ "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": { @@ -6545,17 +4748,10 @@ "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": { @@ -6576,15 +4772,6 @@ "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", - "he": "1.2.0", - "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", @@ -6592,7 +4779,6 @@ "param-case": "2.1.x", "relateurl": "0.2.x", "uglify-js": "3.4.x" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "html-webpack-plugin": { @@ -6601,21 +4787,12 @@ "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": { @@ -6624,17 +4801,10 @@ "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 } } } @@ -6645,17 +4815,10 @@ "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": { @@ -6664,11 +4827,7 @@ "integrity": "sha1-vdw94Jm5ou+sxRxiPyj0FuzFdIU=", "dev": true, "requires": { -<<<<<<< HEAD - "domelementtype": "1.3.1" -======= "domelementtype": "1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "isarray": { @@ -6683,17 +4842,10 @@ "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": { @@ -6716,17 +4868,10 @@ "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": { @@ -6741,15 +4886,9 @@ "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": { @@ -6758,17 +4897,10 @@ "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": { @@ -6777,11 +4909,7 @@ "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", "dev": true, "requires": { -<<<<<<< HEAD - "arr-flatten": "1.1.0" -======= "arr-flatten": "^1.0.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "array-unique": { @@ -6796,15 +4924,9 @@ "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": { @@ -6813,11 +4935,7 @@ "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", "dev": true, "requires": { -<<<<<<< HEAD - "is-posix-bracket": "0.1.1" -======= "is-posix-bracket": "^0.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "extglob": { @@ -6826,11 +4944,7 @@ "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", "dev": true, "requires": { -<<<<<<< HEAD - "is-extglob": "1.0.0" -======= "is-extglob": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "is-extglob": { @@ -6847,11 +4961,7 @@ "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "dev": true, "requires": { -<<<<<<< HEAD - "is-extglob": "2.1.1" -======= "is-extglob": "^2.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "micromatch": { @@ -6860,21 +4970,6 @@ "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", "dev": true, "requires": { -<<<<<<< HEAD - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "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", @@ -6888,7 +4983,6 @@ "object.omit": "^2.0.0", "parse-glob": "^3.0.4", "regex-cache": "^0.4.2" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "is-extglob": { @@ -6903,19 +4997,13 @@ "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", @@ -6927,7 +5015,6 @@ "sshpk": "^1.7.0" } }, ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c "https-browserify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", @@ -6940,11 +5027,7 @@ "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "requires": { -<<<<<<< HEAD - "safer-buffer": "2.1.2" -======= "safer-buffer": ">= 2.1.2 < 3" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "icss-replace-symbols": { @@ -6959,11 +5042,7 @@ "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=", "dev": true, "requires": { -<<<<<<< HEAD - "postcss": "6.0.23" -======= "postcss": "^6.0.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "ieee754": { @@ -6990,11 +5069,7 @@ "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=", "dev": true, "requires": { -<<<<<<< HEAD - "import-from": "2.1.0" -======= "import-from": "^2.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "import-from": { @@ -7003,11 +5078,7 @@ "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=", "dev": true, "requires": { -<<<<<<< HEAD - "resolve-from": "3.0.0" -======= "resolve-from": "^3.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "resolve-from": { @@ -7024,13 +5095,8 @@ "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": { @@ -7039,26 +5105,19 @@ "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": { @@ -7079,13 +5138,8 @@ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { -<<<<<<< HEAD - "once": "1.4.0", - "wrappy": "1.0.2" -======= "once": "^1.3.0", "wrappy": "1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "inherits": { @@ -7100,22 +5154,6 @@ "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", - "cli-width": "2.2.0", - "external-editor": "2.2.0", - "figures": "2.0.0", - "lodash": "4.17.11", - "mute-stream": "0.0.7", - "run-async": "2.3.0", - "rx-lite": "4.0.8", - "rx-lite-aggregates": "4.0.8", - "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", @@ -7130,7 +5168,6 @@ "string-width": "^2.1.0", "strip-ansi": "^4.0.0", "through": "^2.3.6" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "ansi-regex": { @@ -7145,11 +5182,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { -<<<<<<< HEAD - "ansi-regex": "3.0.0" -======= "ansi-regex": "^3.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -7160,11 +5193,7 @@ "integrity": "sha1-rp+/k7mEh4eF1QqN4bNWlWBYz1w=", "dev": true, "requires": { -<<<<<<< HEAD - "meow": "3.7.0" -======= "meow": "^3.3.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "interpret": { @@ -7179,11 +5208,7 @@ "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", "dev": true, "requires": { -<<<<<<< HEAD - "loose-envify": "1.4.0" -======= "loose-envify": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "invert-kv": { @@ -7216,11 +5241,7 @@ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { -<<<<<<< HEAD - "kind-of": "3.2.2" -======= "kind-of": "^3.0.2" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "is-arrayish": { @@ -7235,18 +5256,13 @@ "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "dev": true, "requires": { -<<<<<<< HEAD - "binary-extensions": "1.12.0" -======= "binary-extensions": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, "is-builtin-module": { "version": "1.0.0", @@ -7254,11 +5270,7 @@ "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "dev": true, "requires": { -<<<<<<< HEAD - "builtin-modules": "1.1.1" -======= "builtin-modules": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "is-callable": { @@ -7273,11 +5285,7 @@ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { -<<<<<<< HEAD - "kind-of": "3.2.2" -======= "kind-of": "^3.0.2" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "is-date-object": { @@ -7292,15 +5300,9 @@ "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": { @@ -7329,11 +5331,7 @@ "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", "dev": true, "requires": { -<<<<<<< HEAD - "is-primitive": "2.0.0" -======= "is-primitive": "^2.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "is-extendable": { @@ -7354,11 +5352,7 @@ "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", "dev": true, "requires": { -<<<<<<< HEAD - "number-is-nan": "1.0.1" -======= "number-is-nan": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "is-fullwidth-code-point": { @@ -7373,11 +5367,7 @@ "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", "dev": true, "requires": { -<<<<<<< HEAD - "is-extglob": "2.1.1" -======= "is-extglob": "^2.1.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "is-number": { @@ -7386,11 +5376,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { -<<<<<<< HEAD - "kind-of": "3.2.2" -======= "kind-of": "^3.0.2" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "is-path-cwd": { @@ -7405,11 +5391,7 @@ "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", "dev": true, "requires": { -<<<<<<< HEAD - "is-path-inside": "1.0.1" -======= "is-path-inside": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "is-path-inside": { @@ -7418,11 +5400,7 @@ "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", "dev": true, "requires": { -<<<<<<< HEAD - "path-is-inside": "1.0.2" -======= "path-is-inside": "^1.0.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "is-plain-obj": { @@ -7437,11 +5415,7 @@ "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "dev": true, "requires": { -<<<<<<< HEAD - "isobject": "3.0.1" -======= "isobject": "^3.0.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "is-posix-bracket": { @@ -7468,11 +5442,7 @@ "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", "dev": true, "requires": { -<<<<<<< HEAD - "has": "1.0.3" -======= "has": "^1.0.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "is-resolvable": { @@ -7493,11 +5463,7 @@ "integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=", "dev": true, "requires": { -<<<<<<< HEAD - "html-comment-regex": "1.1.2" -======= "html-comment-regex": "^1.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "is-symbol": { @@ -7506,11 +5472,6 @@ "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==", "dev": true, "requires": { -<<<<<<< HEAD - "has-symbols": "1.0.0" - } - }, -======= "has-symbols": "^1.0.0" } }, @@ -7520,7 +5481,6 @@ "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", @@ -7557,15 +5517,12 @@ "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", @@ -7584,12 +5541,6 @@ "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=", "dev": true, "requires": { -<<<<<<< HEAD - "argparse": "1.0.10", - "esprima": "2.7.3" - } - }, -======= "argparse": "^1.0.7", "esprima": "^2.6.0" } @@ -7600,7 +5551,6 @@ "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", "dev": true }, ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c "jsesc": { "version": "1.3.0", "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", @@ -7619,15 +5569,12 @@ "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", @@ -7640,15 +5587,12 @@ "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", @@ -7661,8 +5605,6 @@ "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", "dev": true }, -<<<<<<< HEAD -======= "jsprim": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", @@ -7675,7 +5617,6 @@ "verror": "1.10.0" } }, ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c "killable": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz", @@ -7688,11 +5629,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { -<<<<<<< HEAD - "is-buffer": "1.1.6" -======= "is-buffer": "^1.1.5" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "last-call-webpack-plugin": { @@ -7701,13 +5638,8 @@ "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": { @@ -7722,11 +5654,7 @@ "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", "dev": true, "requires": { -<<<<<<< HEAD - "invert-kv": "1.0.0" -======= "invert-kv": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "levn": { @@ -7735,13 +5663,8 @@ "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": { @@ -7750,17 +5673,10 @@ "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": { @@ -7777,11 +5693,7 @@ "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": { @@ -7791,15 +5703,9 @@ "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": { @@ -7808,13 +5714,8 @@ "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": { @@ -7823,11 +5724,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { -<<<<<<< HEAD - "pinkie-promise": "2.0.1" -======= "pinkie-promise": "^2.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "pkg-dir": { @@ -7836,11 +5733,7 @@ "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=", "dev": true, "requires": { -<<<<<<< HEAD - "find-up": "1.1.2" -======= "find-up": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -7857,15 +5750,9 @@ "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": { @@ -7874,13 +5761,8 @@ "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": { @@ -7889,30 +5771,24 @@ "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", @@ -7925,8 +5801,6 @@ "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", @@ -7939,7 +5813,6 @@ "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", @@ -7952,11 +5825,7 @@ "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", "dev": true, "requires": { -<<<<<<< HEAD - "chalk": "2.4.1" -======= "chalk": "^2.0.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "loglevel": { @@ -7977,11 +5846,7 @@ "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": { @@ -7990,13 +5855,8 @@ "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": { @@ -8011,13 +5871,8 @@ "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": { @@ -8026,11 +5881,7 @@ "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", "dev": true, "requires": { -<<<<<<< HEAD - "pify": "3.0.0" -======= "pify": "^3.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "map-cache": { @@ -8051,11 +5902,7 @@ "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", "dev": true, "requires": { -<<<<<<< HEAD - "object-visit": "1.0.1" -======= "object-visit": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "math-expression-evaluator": { @@ -8076,15 +5923,9 @@ "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": { @@ -8099,11 +5940,7 @@ "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", "dev": true, "requires": { -<<<<<<< HEAD - "mimic-fn": "1.2.0" -======= "mimic-fn": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "memory-fs": { @@ -8112,13 +5949,8 @@ "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": { @@ -8127,18 +5959,6 @@ "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "requires": { -<<<<<<< HEAD - "camelcase-keys": "2.1.0", - "decamelize": "1.2.0", - "loud-rejection": "1.6.0", - "map-obj": "1.0.1", - "minimist": "1.2.0", - "normalize-package-data": "2.4.0", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "redent": "1.0.0", - "trim-newlines": "1.0.0" -======= "camelcase-keys": "^2.0.0", "decamelize": "^1.1.2", "loud-rejection": "^1.0.0", @@ -8149,7 +5969,6 @@ "read-pkg-up": "^1.0.1", "redent": "^1.0.0", "trim-newlines": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "find-up": { @@ -8158,13 +5977,8 @@ "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": { @@ -8173,19 +5987,11 @@ "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": { @@ -8200,11 +6006,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { -<<<<<<< HEAD - "pinkie-promise": "2.0.1" -======= "pinkie-promise": "^2.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "path-type": { @@ -8213,15 +6015,9 @@ "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": { @@ -8236,15 +6032,9 @@ "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": { @@ -8253,13 +6043,8 @@ "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": { @@ -8268,11 +6053,7 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { -<<<<<<< HEAD - "is-utf8": "0.2.1" -======= "is-utf8": "^0.2.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -8295,21 +6076,6 @@ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, "requires": { -<<<<<<< HEAD - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "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.13", - "object.pick": "1.3.0", - "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", @@ -8323,7 +6089,6 @@ "regex-not": "^1.0.0", "snapdragon": "^0.8.1", "to-regex": "^3.0.2" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "kind-of": { @@ -8340,13 +6105,8 @@ "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": { @@ -8367,11 +6127,7 @@ "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==", "dev": true, "requires": { -<<<<<<< HEAD - "mime-db": "1.37.0" -======= "mime-db": "~1.37.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "mimic-fn": { @@ -8398,11 +6154,7 @@ "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "requires": { -<<<<<<< HEAD - "brace-expansion": "1.1.11" -======= "brace-expansion": "^1.1.7" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "minimist": { @@ -8411,8 +6163,6 @@ "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", @@ -8423,25 +6173,12 @@ "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", - "flush-write-stream": "1.0.3", - "from2": "2.3.0", - "parallel-transform": "1.1.0", - "pump": "2.0.1", - "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", @@ -8452,7 +6189,6 @@ "pumpify": "^1.3.3", "stream-each": "^1.1.0", "through2": "^2.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "mixin-deep": { @@ -8461,13 +6197,8 @@ "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": { @@ -8476,17 +6207,11 @@ "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", @@ -8505,7 +6230,6 @@ } } }, ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c "mkdirp": { "version": "0.5.1", "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", @@ -8521,28 +6245,18 @@ "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": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "multicast-dns": { "version": "6.2.3", @@ -8550,13 +6264,8 @@ "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": { @@ -8571,34 +6280,18 @@ "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", - "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.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", @@ -8610,7 +6303,6 @@ "regex-not": "^1.0.0", "snapdragon": "^0.8.1", "to-regex": "^3.0.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "kind-of": { @@ -8651,11 +6343,7 @@ "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", "dev": true, "requires": { -<<<<<<< HEAD - "lower-case": "1.1.4" -======= "lower-case": "^1.1.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "node-forge": { @@ -8664,36 +6352,6 @@ "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", - "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==", - "dev": true, - "requires": { - "assert": "1.4.1", - "browserify-zlib": "0.2.0", - "buffer": "4.9.1", - "console-browserify": "1.1.0", - "constants-browserify": "1.0.0", - "crypto-browserify": "3.12.0", - "domain-browser": "1.2.0", - "events": "1.1.1", - "https-browserify": "1.0.0", - "os-browserify": "0.3.0", - "path-browserify": "0.0.0", - "process": "0.11.10", - "punycode": "1.4.1", - "querystring-es3": "0.2.1", - "readable-stream": "2.3.6", - "stream-browserify": "2.0.1", - "stream-http": "2.8.3", - "string_decoder": "1.1.1", - "timers-browserify": "2.0.10", - "tty-browserify": "0.0.0", - "url": "0.11.0", - "util": "0.10.4", -======= "node-gyp": { "version": "3.8.0", "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz", @@ -8750,7 +6408,6 @@ "tty-browserify": "0.0.0", "url": "^0.11.0", "util": "^0.10.3", ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c "vm-browserify": "0.0.4" }, "dependencies": { @@ -8768,12 +6425,6 @@ "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", @@ -8851,7 +6502,6 @@ "dev": true, "requires": { "abbrev": "1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "normalize-package-data": { @@ -8860,17 +6510,10 @@ "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": { @@ -8879,11 +6522,7 @@ "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { -<<<<<<< HEAD - "remove-trailing-separator": "1.1.0" -======= "remove-trailing-separator": "^1.0.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "normalize-range": { @@ -8898,17 +6537,10 @@ "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": { @@ -8917,9 +6549,6 @@ "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "dev": true, "requires": { -<<<<<<< HEAD - "path-key": "2.0.1" -======= "path-key": "^2.0.0" } }, @@ -8933,7 +6562,6 @@ "console-control-strings": "~1.1.0", "gauge": "~2.7.3", "set-blocking": "~2.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "nth-check": { @@ -8942,11 +6570,7 @@ "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", "dev": true, "requires": { -<<<<<<< HEAD - "boolbase": "1.0.0" -======= "boolbase": "~1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "num2fraction": { @@ -8961,15 +6585,12 @@ "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", @@ -8982,15 +6603,9 @@ "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": { @@ -8999,11 +6614,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { -<<<<<<< HEAD - "is-descriptor": "0.1.6" -======= "is-descriptor": "^0.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -9026,11 +6637,7 @@ "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", "dev": true, "requires": { -<<<<<<< HEAD - "isobject": "3.0.1" -======= "isobject": "^3.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "object.omit": { @@ -9039,13 +6646,8 @@ "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": { @@ -9054,11 +6656,7 @@ "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "dev": true, "requires": { -<<<<<<< HEAD - "isobject": "3.0.1" -======= "isobject": "^3.0.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "obuf": { @@ -9088,11 +6686,7 @@ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { -<<<<<<< HEAD - "wrappy": "1.0.2" -======= "wrappy": "1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "onetime": { @@ -9101,11 +6695,7 @@ "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", "dev": true, "requires": { -<<<<<<< HEAD - "mimic-fn": "1.2.0" -======= "mimic-fn": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "opener": { @@ -9120,11 +6710,7 @@ "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": { @@ -9133,13 +6719,8 @@ "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": { @@ -9148,21 +6729,12 @@ "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": { @@ -9171,17 +6743,10 @@ "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": { @@ -9190,11 +6755,7 @@ "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": { @@ -9215,15 +6776,9 @@ "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": { @@ -9232,8 +6787,6 @@ "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", @@ -9244,7 +6797,6 @@ "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", @@ -9257,11 +6809,7 @@ "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", "dev": true, "requires": { -<<<<<<< HEAD - "p-try": "1.0.0" -======= "p-try": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "p-locate": { @@ -9270,11 +6818,7 @@ "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, "requires": { -<<<<<<< HEAD - "p-limit": "1.3.0" -======= "p-limit": "^1.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "p-map": { @@ -9301,15 +6845,9 @@ "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": { @@ -9318,11 +6856,7 @@ "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", "dev": true, "requires": { -<<<<<<< HEAD - "no-case": "2.3.2" -======= "no-case": "^2.2.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "parse-asn1": { @@ -9331,19 +6865,11 @@ "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": { @@ -9352,17 +6878,10 @@ "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": { @@ -9377,11 +6896,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { -<<<<<<< HEAD - "is-extglob": "1.0.0" -======= "is-extglob": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -9392,11 +6907,7 @@ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { -<<<<<<< HEAD - "error-ex": "1.3.2" -======= "error-ex": "^1.2.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "parseurl": { @@ -9465,11 +6976,7 @@ "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", "dev": true, "requires": { -<<<<<<< HEAD - "pify": "3.0.0" -======= "pify": "^3.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "pbkdf2": { @@ -9478,15 +6985,6 @@ "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", - "safe-buffer": "5.1.2", - "sha.js": "2.4.11" - } - }, -======= "create-hash": "^1.1.2", "create-hmac": "^1.1.4", "ripemd160": "^2.0.1", @@ -9500,7 +6998,6 @@ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", "dev": true }, ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c "pify": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", @@ -9519,11 +7016,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { -<<<<<<< HEAD - "pinkie": "2.0.4" -======= "pinkie": "^2.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "pkg-dir": { @@ -9532,11 +7025,7 @@ "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", "dev": true, "requires": { -<<<<<<< HEAD - "find-up": "2.1.0" -======= "find-up": "^2.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "pluralize": { @@ -9551,15 +7040,9 @@ "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": { @@ -9582,15 +7065,9 @@ "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": { @@ -9599,15 +7076,9 @@ "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": { @@ -9622,19 +7093,11 @@ "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": { @@ -9657,17 +7120,10 @@ "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": { @@ -9682,11 +7138,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "1.0.0" -======= "has-flag": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -9697,15 +7149,9 @@ "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": { @@ -9720,19 +7166,11 @@ "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": { @@ -9755,17 +7193,10 @@ "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": { @@ -9780,11 +7211,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "1.0.0" -======= "has-flag": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -9795,13 +7222,8 @@ "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": { @@ -9816,19 +7238,11 @@ "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": { @@ -9851,17 +7265,10 @@ "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": { @@ -9876,11 +7283,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "1.0.0" -======= "has-flag": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -9891,11 +7294,7 @@ "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=", "dev": true, "requires": { -<<<<<<< HEAD - "postcss": "5.2.18" -======= "postcss": "^5.0.14" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "ansi-styles": { @@ -9910,19 +7309,11 @@ "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": { @@ -9945,17 +7336,10 @@ "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": { @@ -9970,11 +7354,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "1.0.0" -======= "has-flag": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -9985,11 +7365,7 @@ "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=", "dev": true, "requires": { -<<<<<<< HEAD - "postcss": "5.2.18" -======= "postcss": "^5.0.4" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "ansi-styles": { @@ -10004,19 +7380,11 @@ "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": { @@ -10039,17 +7407,10 @@ "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": { @@ -10064,11 +7425,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "1.0.0" -======= "has-flag": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -10079,11 +7436,7 @@ "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=", "dev": true, "requires": { -<<<<<<< HEAD - "postcss": "5.2.18" -======= "postcss": "^5.0.14" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "ansi-styles": { @@ -10098,19 +7451,11 @@ "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": { @@ -10133,17 +7478,10 @@ "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": { @@ -10158,11 +7496,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "1.0.0" -======= "has-flag": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -10173,11 +7507,7 @@ "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=", "dev": true, "requires": { -<<<<<<< HEAD - "postcss": "5.2.18" -======= "postcss": "^5.0.16" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "ansi-styles": { @@ -10192,19 +7522,11 @@ "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": { @@ -10227,17 +7549,10 @@ "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": { @@ -10252,11 +7567,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "1.0.0" -======= "has-flag": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -10267,13 +7578,8 @@ "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": { @@ -10288,19 +7594,11 @@ "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": { @@ -10323,17 +7621,10 @@ "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": { @@ -10348,11 +7639,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "1.0.0" -======= "has-flag": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -10363,11 +7650,7 @@ "integrity": "sha512-T53GVFsdinJhgwm7rg1BzbeBRomOg9y5MBVhGcsV0CxurUdVj1UlPdKtn7aqYA/c/QVkzKMjq2bSV5dKG5+AwQ==", "dev": true, "requires": { -<<<<<<< HEAD - "postcss": "5.2.18" -======= "postcss": "^5.0.4" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "ansi-styles": { @@ -10382,19 +7665,11 @@ "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": { @@ -10417,17 +7692,10 @@ "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": { @@ -10442,11 +7710,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "1.0.0" -======= "has-flag": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -10457,17 +7721,10 @@ "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": { @@ -10476,13 +7733,8 @@ "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": { @@ -10491,13 +7743,8 @@ "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": { @@ -10506,15 +7753,6 @@ "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==", "dev": true, "requires": { -<<<<<<< HEAD - "is-directory": "0.3.1", - "js-yaml": "3.7.0", - "minimist": "1.2.0", - "object-assign": "4.1.1", - "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", @@ -10522,7 +7760,6 @@ "os-homedir": "^1.0.1", "parse-json": "^2.2.0", "require-from-string": "^1.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "minimist": { @@ -10545,13 +7782,8 @@ "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": { @@ -10560,15 +7792,6 @@ "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==", "dev": true, "requires": { -<<<<<<< HEAD - "is-directory": "0.3.1", - "js-yaml": "3.7.0", - "minimist": "1.2.0", - "object-assign": "4.1.1", - "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", @@ -10576,7 +7799,6 @@ "os-homedir": "^1.0.1", "parse-json": "^2.2.0", "require-from-string": "^1.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "minimist": { @@ -10599,17 +7821,10 @@ "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": { @@ -10618,17 +7833,10 @@ "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": { @@ -10655,13 +7863,8 @@ "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 } } } @@ -10672,15 +7875,9 @@ "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": { @@ -10695,19 +7892,11 @@ "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": { @@ -10730,17 +7919,10 @@ "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": { @@ -10755,11 +7937,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "1.0.0" -======= "has-flag": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -10770,11 +7948,7 @@ "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=", "dev": true, "requires": { -<<<<<<< HEAD - "postcss": "5.2.18" -======= "postcss": "^5.0.4" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "ansi-styles": { @@ -10789,19 +7963,11 @@ "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": { @@ -10824,17 +7990,10 @@ "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": { @@ -10849,11 +8008,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "1.0.0" -======= "has-flag": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -10864,19 +8019,11 @@ "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": { @@ -10891,13 +8038,8 @@ "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": { @@ -10906,19 +8048,11 @@ "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": { @@ -10941,17 +8075,10 @@ "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": { @@ -10966,11 +8093,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "1.0.0" -======= "has-flag": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -10987,15 +8110,9 @@ "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": { @@ -11010,19 +8127,11 @@ "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": { @@ -11045,17 +8154,10 @@ "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": { @@ -11070,11 +8172,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "1.0.0" -======= "has-flag": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -11085,13 +8183,8 @@ "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": { @@ -11106,19 +8199,11 @@ "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": { @@ -11141,17 +8226,10 @@ "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": { @@ -11166,11 +8244,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "1.0.0" -======= "has-flag": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -11181,17 +8255,10 @@ "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": { @@ -11206,19 +8273,11 @@ "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": { @@ -11241,17 +8300,10 @@ "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": { @@ -11266,11 +8318,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "1.0.0" -======= "has-flag": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -11281,17 +8329,10 @@ "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": { @@ -11306,19 +8347,11 @@ "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": { @@ -11341,17 +8374,10 @@ "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": { @@ -11366,11 +8392,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "1.0.0" -======= "has-flag": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -11381,11 +8403,7 @@ "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": { @@ -11394,13 +8412,8 @@ "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": { @@ -11409,13 +8422,8 @@ "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": { @@ -11424,13 +8432,8 @@ "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": { @@ -11439,11 +8442,7 @@ "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=", "dev": true, "requires": { -<<<<<<< HEAD - "postcss": "5.2.18" -======= "postcss": "^5.0.5" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "ansi-styles": { @@ -11458,19 +8457,11 @@ "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": { @@ -11493,17 +8484,10 @@ "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": { @@ -11518,11 +8502,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "1.0.0" -======= "has-flag": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -11533,17 +8513,10 @@ "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": { @@ -11558,19 +8531,11 @@ "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": { @@ -11593,17 +8558,10 @@ "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": { @@ -11618,11 +8576,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "1.0.0" -======= "has-flag": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -11633,13 +8587,8 @@ "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": { @@ -11654,19 +8603,11 @@ "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": { @@ -11689,17 +8630,10 @@ "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": { @@ -11714,11 +8648,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "1.0.0" -======= "has-flag": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -11729,13 +8659,8 @@ "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": { @@ -11750,19 +8675,11 @@ "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": { @@ -11785,17 +8702,10 @@ "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": { @@ -11810,11 +8720,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "1.0.0" -======= "has-flag": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -11825,11 +8731,7 @@ "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=", "dev": true, "requires": { -<<<<<<< HEAD - "postcss": "5.2.18" -======= "postcss": "^5.0.4" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "ansi-styles": { @@ -11844,19 +8746,11 @@ "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": { @@ -11879,17 +8773,10 @@ "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": { @@ -11904,11 +8791,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "1.0.0" -======= "has-flag": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -11919,15 +8802,9 @@ "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": { @@ -11942,19 +8819,11 @@ "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": { @@ -11977,17 +8846,10 @@ "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": { @@ -12002,11 +8864,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "1.0.0" -======= "has-flag": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -12017,15 +8875,9 @@ "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": { @@ -12034,17 +8886,10 @@ "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": { @@ -12059,19 +8904,11 @@ "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": { @@ -12094,17 +8931,10 @@ "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": { @@ -12119,11 +8949,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "1.0.0" -======= "has-flag": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -12134,15 +8960,9 @@ "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": { @@ -12157,19 +8977,11 @@ "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": { @@ -12192,17 +9004,10 @@ "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": { @@ -12217,11 +9022,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "1.0.0" -======= "has-flag": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -12232,19 +9033,11 @@ "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": { @@ -12259,15 +9052,9 @@ "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": { @@ -12282,19 +9069,11 @@ "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": { @@ -12317,17 +9096,10 @@ "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": { @@ -12342,11 +9114,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "1.0.0" -======= "has-flag": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -12381,13 +9149,8 @@ "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": { @@ -12426,11 +9189,7 @@ "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==", "dev": true, "requires": { -<<<<<<< HEAD - "forwarded": "0.1.2", -======= "forwarded": "~0.1.2", ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c "ipaddr.js": "1.8.0" } }, @@ -12446,36 +9205,24 @@ "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": { @@ -12484,13 +9231,8 @@ "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": { @@ -12499,15 +9241,9 @@ "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": { @@ -12534,13 +9270,8 @@ "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": { @@ -12561,29 +9292,20 @@ "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": { @@ -12606,11 +9328,7 @@ "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==", "dev": true, "requires": { -<<<<<<< HEAD - "safe-buffer": "5.1.2" -======= "safe-buffer": "^5.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "randomfill": { @@ -12619,13 +9337,8 @@ "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": { @@ -12652,11 +9365,7 @@ "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", "dev": true, "requires": { -<<<<<<< HEAD - "safer-buffer": "2.1.2" -======= "safer-buffer": ">= 2.1.2 < 3" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -12667,11 +9376,7 @@ "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=", "dev": true, "requires": { -<<<<<<< HEAD - "pify": "2.3.0" -======= "pify": "^2.3.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "pify": { @@ -12688,15 +9393,9 @@ "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": { @@ -12705,11 +9404,7 @@ "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", "dev": true, "requires": { -<<<<<<< HEAD - "pify": "2.3.0" -======= "pify": "^2.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "pify": { @@ -12726,13 +9421,8 @@ "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": { @@ -12741,15 +9431,6 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { -<<<<<<< HEAD - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "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", @@ -12757,7 +9438,6 @@ "safe-buffer": "~5.1.1", "string_decoder": "~1.1.1", "util-deprecate": "~1.0.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "readdirp": { @@ -12766,15 +9446,9 @@ "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": { @@ -12783,11 +9457,7 @@ "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", "dev": true, "requires": { -<<<<<<< HEAD - "resolve": "1.8.1" -======= "resolve": "^1.1.6" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "redent": { @@ -12796,13 +9466,8 @@ "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": { @@ -12811,15 +9476,9 @@ "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": { @@ -12836,11 +9495,7 @@ "integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=", "dev": true, "requires": { -<<<<<<< HEAD - "balanced-match": "0.4.2" -======= "balanced-match": "^0.4.2" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "balanced-match": { @@ -12869,15 +9524,9 @@ "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": { @@ -12886,11 +9535,7 @@ "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", "dev": true, "requires": { -<<<<<<< HEAD - "is-equal-shallow": "0.1.3" -======= "is-equal-shallow": "^0.1.3" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "regex-not": { @@ -12899,13 +9544,8 @@ "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": { @@ -12920,15 +9560,9 @@ "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": { @@ -12943,11 +9577,7 @@ "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", "dev": true, "requires": { -<<<<<<< HEAD - "jsesc": "0.5.0" -======= "jsesc": "~0.5.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "jsesc": { @@ -12976,19 +9606,11 @@ "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": { @@ -13009,9 +9631,6 @@ "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, "requires": { -<<<<<<< HEAD - "is-finite": "1.0.2" -======= "is-finite": "^1.0.0" } }, @@ -13041,7 +9660,6 @@ "tough-cookie": "~2.4.3", "tunnel-agent": "^0.6.0", "uuid": "^3.3.2" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "require-directory": { @@ -13068,13 +9686,8 @@ "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": { @@ -13089,11 +9702,7 @@ "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==", "dev": true, "requires": { -<<<<<<< HEAD - "path-parse": "1.0.6" -======= "path-parse": "^1.0.5" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "resolve-cwd": { @@ -13102,11 +9711,7 @@ "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", "dev": true, "requires": { -<<<<<<< HEAD - "resolve-from": "3.0.0" -======= "resolve-from": "^3.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "resolve-from": { @@ -13135,13 +9740,8 @@ "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": { @@ -13156,11 +9756,7 @@ "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", "dev": true, "requires": { -<<<<<<< HEAD - "align-text": "0.1.4" -======= "align-text": "^0.1.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "rimraf": { @@ -13169,11 +9765,7 @@ "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "dev": true, "requires": { -<<<<<<< HEAD - "glob": "7.1.3" -======= "glob": "^7.0.5" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "ripemd160": { @@ -13182,13 +9774,8 @@ "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": { @@ -13197,11 +9784,7 @@ "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", "dev": true, "requires": { -<<<<<<< HEAD - "is-promise": "2.1.0" -======= "is-promise": "^2.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "run-queue": { @@ -13210,11 +9793,7 @@ "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", "dev": true, "requires": { -<<<<<<< HEAD - "aproba": "1.2.0" -======= "aproba": "^1.1.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "rx-lite": { @@ -13229,11 +9808,7 @@ "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=", "dev": true, "requires": { -<<<<<<< HEAD - "rx-lite": "4.0.8" -======= "rx-lite": "*" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "safe-buffer": { @@ -13248,11 +9823,7 @@ "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "dev": true, "requires": { -<<<<<<< HEAD - "ret": "0.1.15" -======= "ret": "~0.1.10" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "safer-buffer": { @@ -13261,8 +9832,6 @@ "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", @@ -13458,7 +10027,6 @@ "semver": "^5.5.0" } }, ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c "sax": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", @@ -13471,9 +10039,6 @@ "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", "dev": true, "requires": { -<<<<<<< HEAD - "ajv": "5.5.2" -======= "ajv": "^5.0.0" } }, @@ -13496,7 +10061,6 @@ "amdefine": ">=0.0.4" } } ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "select-hose": { @@ -13527,20 +10091,6 @@ "dev": true, "requires": { "debug": "2.6.9", -<<<<<<< HEAD - "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.3", - "mime": "1.4.1", - "ms": "2.0.0", - "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", @@ -13553,7 +10103,6 @@ "on-finished": "~2.3.0", "range-parser": "~1.2.0", "statuses": "~1.4.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "mime": { @@ -13576,15 +10125,6 @@ "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", "dev": true, "requires": { -<<<<<<< HEAD - "accepts": "1.3.5", - "batch": "0.6.1", - "debug": "2.6.9", - "escape-html": "1.0.3", - "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", @@ -13592,7 +10132,6 @@ "http-errors": "~1.6.2", "mime-types": "~2.1.17", "parseurl": "~1.3.2" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "serve-static": { @@ -13601,15 +10140,9 @@ "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" } }, @@ -13625,17 +10158,10 @@ "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": { @@ -13644,11 +10170,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { -<<<<<<< HEAD - "is-extendable": "0.1.1" -======= "is-extendable": "^0.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -13671,10 +10193,6 @@ "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" } @@ -13696,7 +10214,6 @@ "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", "dev": true } ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "shebang-command": { @@ -13705,11 +10222,7 @@ "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { -<<<<<<< HEAD - "shebang-regex": "1.0.0" -======= "shebang-regex": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "shebang-regex": { @@ -13724,15 +10237,9 @@ "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": { @@ -13759,11 +10266,7 @@ "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": { @@ -13772,16 +10275,6 @@ "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", - "extend-shallow": "2.0.1", - "map-cache": "0.2.2", - "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", @@ -13790,7 +10283,6 @@ "source-map": "^0.5.6", "source-map-resolve": "^0.5.0", "use": "^3.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "define-property": { @@ -13799,11 +10291,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { -<<<<<<< HEAD - "is-descriptor": "0.1.6" -======= "is-descriptor": "^0.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "extend-shallow": { @@ -13812,11 +10300,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { -<<<<<<< HEAD - "is-extendable": "0.1.1" -======= "is-extendable": "^0.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "source-map": { @@ -13833,15 +10317,9 @@ "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": { @@ -13850,11 +10328,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { -<<<<<<< HEAD - "is-descriptor": "1.0.2" -======= "is-descriptor": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "is-accessor-descriptor": { @@ -13863,11 +10337,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { -<<<<<<< HEAD - "kind-of": "6.0.2" -======= "kind-of": "^6.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "is-data-descriptor": { @@ -13876,11 +10346,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { -<<<<<<< HEAD - "kind-of": "6.0.2" -======= "kind-of": "^6.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "is-descriptor": { @@ -13889,15 +10355,9 @@ "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": { @@ -13914,11 +10374,7 @@ "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", "dev": true, "requires": { -<<<<<<< HEAD - "kind-of": "3.2.2" -======= "kind-of": "^3.2.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "sockjs": { @@ -13927,13 +10383,8 @@ "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": { @@ -13942,21 +10393,12 @@ "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": { @@ -13965,11 +10407,7 @@ "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=", "dev": true, "requires": { -<<<<<<< HEAD - "websocket-driver": "0.7.0" -======= "websocket-driver": ">=0.5.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -13980,11 +10418,7 @@ "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=", "dev": true, "requires": { -<<<<<<< HEAD - "is-plain-obj": "1.1.0" -======= "is-plain-obj": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "source-list-map": { @@ -14005,19 +10439,11 @@ "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": { @@ -14026,11 +10452,7 @@ "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", "dev": true, "requires": { -<<<<<<< HEAD - "source-map": "0.5.7" -======= "source-map": "^0.5.6" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "source-map": { @@ -14053,13 +10475,8 @@ "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": { @@ -14074,13 +10491,8 @@ "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": { @@ -14095,21 +10507,12 @@ "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": { @@ -14118,15 +10521,6 @@ "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", - "obuf": "1.1.2", - "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", @@ -14134,7 +10528,6 @@ "readable-stream": "^2.2.9", "safe-buffer": "^5.0.1", "wbuf": "^1.7.2" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "split-string": { @@ -14143,11 +10536,7 @@ "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": { @@ -14156,8 +10545,6 @@ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", "dev": true }, -<<<<<<< HEAD -======= "sshpk": { "version": "1.15.2", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.15.2.tgz", @@ -14175,18 +10562,13 @@ "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": { @@ -14201,13 +10583,8 @@ "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": { @@ -14216,11 +10593,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { -<<<<<<< HEAD - "is-descriptor": "0.1.6" -======= "is-descriptor": "^0.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -14231,8 +10604,6 @@ "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", @@ -14242,20 +10613,14 @@ "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": { @@ -14264,13 +10629,8 @@ "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": { @@ -14279,19 +10639,11 @@ "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": { @@ -14312,13 +10664,8 @@ "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": { @@ -14333,11 +10680,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { -<<<<<<< HEAD - "ansi-regex": "3.0.0" -======= "ansi-regex": "^3.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -14348,11 +10691,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { -<<<<<<< HEAD - "safe-buffer": "5.1.2" -======= "safe-buffer": "~5.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "strip-ansi": { @@ -14361,11 +10700,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { -<<<<<<< HEAD - "ansi-regex": "2.1.1" -======= "ansi-regex": "^2.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "strip-bom": { @@ -14386,11 +10721,7 @@ "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", "dev": true, "requires": { -<<<<<<< HEAD - "get-stdin": "4.0.1" -======= "get-stdin": "^4.0.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "strip-json-comments": { @@ -14405,11 +10736,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "3.0.0" -======= "has-flag": "^3.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "svgo": { @@ -14418,15 +10745,6 @@ "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=", "dev": true, "requires": { -<<<<<<< HEAD - "coa": "1.0.4", - "colors": "1.1.2", - "csso": "2.3.2", - "js-yaml": "3.7.0", - "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", @@ -14434,7 +10752,6 @@ "mkdirp": "~0.5.1", "sax": "~1.2.1", "whet.extend": "~0.9.9" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "table": { @@ -14443,21 +10760,12 @@ "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": { @@ -14466,8 +10774,6 @@ "integrity": "sha512-2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==", "dev": true }, -<<<<<<< HEAD -======= "tar": { "version": "2.2.1", "resolved": "http://registry.npmjs.org/tar/-/tar-2.2.1.tgz", @@ -14479,7 +10785,6 @@ "inherits": "2" } }, ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c "text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", @@ -14498,13 +10803,8 @@ "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": { @@ -14525,11 +10825,7 @@ "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==", "dev": true, "requires": { -<<<<<<< HEAD - "setimmediate": "1.0.5" -======= "setimmediate": "^1.0.4" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "tmp": { @@ -14538,11 +10834,7 @@ "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "dev": true, "requires": { -<<<<<<< HEAD - "os-tmpdir": "1.0.2" -======= "os-tmpdir": "~1.0.2" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "to-arraybuffer": { @@ -14563,11 +10855,7 @@ "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "dev": true, "requires": { -<<<<<<< HEAD - "kind-of": "3.2.2" -======= "kind-of": "^3.0.2" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "to-regex": { @@ -14576,17 +10864,10 @@ "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": { @@ -14595,13 +10876,8 @@ "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": { @@ -14610,8 +10886,6 @@ "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", @@ -14630,7 +10904,6 @@ } } }, ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c "trim-newlines": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", @@ -14643,8 +10916,6 @@ "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", @@ -14654,7 +10925,6 @@ "glob": "^7.1.2" } }, ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c "tryer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz", @@ -14667,8 +10937,6 @@ "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", @@ -14684,18 +10952,13 @@ "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": { @@ -14705,11 +10968,7 @@ "dev": true, "requires": { "media-typer": "0.3.0", -<<<<<<< HEAD - "mime-types": "2.1.21" -======= "mime-types": "~2.1.18" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "typedarray": { @@ -14724,13 +10983,8 @@ "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": { @@ -14746,16 +11000,6 @@ "integrity": "sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw==", "dev": true, "requires": { -<<<<<<< HEAD - "cacache": "10.0.4", - "find-cache-dir": "1.0.0", - "schema-utils": "0.4.7", - "serialize-javascript": "1.5.0", - "source-map": "0.6.1", - "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", @@ -14764,7 +11008,6 @@ "uglify-es": "^3.3.4", "webpack-sources": "^1.1.0", "worker-farm": "^1.5.2" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "ajv": { @@ -14773,17 +11016,10 @@ "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": { @@ -14816,13 +11052,8 @@ "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": { @@ -14831,13 +11062,8 @@ "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 } } } @@ -14848,17 +11074,10 @@ "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": { @@ -14867,11 +11086,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { -<<<<<<< HEAD - "is-extendable": "0.1.1" -======= "is-extendable": "^0.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "set-value": { @@ -14880,17 +11095,10 @@ "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 } } } @@ -14913,11 +11121,7 @@ "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", "dev": true, "requires": { -<<<<<<< HEAD - "unique-slug": "2.0.1" -======= "unique-slug": "^2.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "unique-slug": { @@ -14926,11 +11130,7 @@ "integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==", "dev": true, "requires": { -<<<<<<< HEAD - "imurmurhash": "0.1.4" -======= "imurmurhash": "^0.1.4" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "unpipe": { @@ -14945,13 +11145,8 @@ "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": { @@ -14960,15 +11155,9 @@ "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": { @@ -15008,11 +11197,7 @@ "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", "dev": true, "requires": { -<<<<<<< HEAD - "punycode": "2.1.1" -======= "punycode": "^2.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "urix": { @@ -15045,13 +11230,8 @@ "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": { @@ -15068,13 +11248,8 @@ "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": { @@ -15122,13 +11297,8 @@ "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": { @@ -15143,8 +11313,6 @@ "integrity": "sha512-w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ==", "dev": true }, -<<<<<<< HEAD -======= "verror": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", @@ -15156,7 +11324,6 @@ "extsprintf": "^1.2.0" } }, ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c "vm-browserify": { "version": "0.0.4", "resolved": "http://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", @@ -15177,21 +11344,12 @@ "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": { @@ -15200,11 +11358,7 @@ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { -<<<<<<< HEAD - "ms": "2.1.1" -======= "ms": "^2.1.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "ms": { @@ -15221,35 +11375,17 @@ "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", - "lru-cache": "4.1.5", - "postcss": "6.0.23", - "postcss-load-config": "1.2.0", - "postcss-selector-parser": "2.2.3", - "prettier": "1.15.3", - "resolve": "1.8.1", - "source-map": "0.6.1", - "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", @@ -15263,7 +11399,6 @@ "vue-hot-reload-api": "^2.2.0", "vue-style-loader": "^3.0.0", "vue-template-es2015-compiler": "^1.6.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "cosmiconfig": { @@ -15272,15 +11407,6 @@ "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==", "dev": true, "requires": { -<<<<<<< HEAD - "is-directory": "0.3.1", - "js-yaml": "3.7.0", - "minimist": "1.2.0", - "object-assign": "4.1.1", - "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", @@ -15288,7 +11414,6 @@ "os-homedir": "^1.0.1", "parse-json": "^2.2.0", "require-from-string": "^1.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "minimist": { @@ -15303,17 +11428,10 @@ "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": { @@ -15335,13 +11453,8 @@ "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": { @@ -15350,13 +11463,8 @@ "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": { @@ -15371,15 +11479,9 @@ "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": { @@ -15388,11 +11490,7 @@ "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", "dev": true, "requires": { -<<<<<<< HEAD - "minimalistic-assert": "1.0.1" -======= "minimalistic-assert": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "webpack": { @@ -15401,30 +11499,6 @@ "integrity": "sha512-Sw7MdIIOv/nkzPzee4o0EdvCuPmxT98+vVpIvwtcwcF1Q4SDSNp92vwcKc4REe7NItH9f1S4ra9FuQ7yuYZ8bQ==", "dev": true, "requires": { -<<<<<<< HEAD - "acorn": "5.7.3", - "acorn-dynamic-import": "2.0.2", - "ajv": "6.6.1", - "ajv-keywords": "3.2.0", - "async": "2.6.1", - "enhanced-resolve": "3.4.1", - "escope": "3.6.0", - "interpret": "1.1.0", - "json-loader": "0.5.7", - "json5": "0.5.1", - "loader-runner": "2.3.1", - "loader-utils": "1.1.0", - "memory-fs": "0.4.1", - "mkdirp": "0.5.1", - "node-libs-browser": "2.1.0", - "source-map": "0.5.7", - "supports-color": "4.5.0", - "tapable": "0.2.9", - "uglifyjs-webpack-plugin": "0.4.6", - "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", @@ -15447,7 +11521,6 @@ "watchpack": "^1.4.0", "webpack-sources": "^1.0.1", "yargs": "^8.0.2" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "ajv": { @@ -15456,17 +11529,10 @@ "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": { @@ -15505,11 +11571,7 @@ "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", "dev": true, "requires": { -<<<<<<< HEAD - "has-flag": "2.0.0" -======= "has-flag": "^2.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "uglify-js": { @@ -15518,15 +11580,9 @@ "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": { @@ -15535,15 +11591,9 @@ "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" } } @@ -15555,15 +11605,9 @@ "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 } } } @@ -15574,20 +11618,6 @@ "integrity": "sha512-rwxyfecTAxoarCC9VlHlIpfQCmmJ/qWD5bpbjkof+7HrNhTNZIwZITxN6CdlYL2axGmwNUQ+tFgcSOiNXMf/sQ==", "dev": true, "requires": { -<<<<<<< HEAD - "acorn": "5.7.3", - "bfj-node4": "5.3.1", - "chalk": "2.4.1", - "commander": "2.17.1", - "ejs": "2.6.1", - "express": "4.16.4", - "filesize": "3.6.1", - "gzip-size": "4.1.0", - "lodash": "4.17.11", - "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", @@ -15600,7 +11630,6 @@ "mkdirp": "^0.5.1", "opener": "^1.4.3", "ws": "^4.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "webpack-dev-middleware": { @@ -15609,19 +11638,11 @@ "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": { @@ -15631,32 +11652,6 @@ "dev": true, "requires": { "ansi-html": "0.0.7", -<<<<<<< HEAD - "array-includes": "3.0.3", - "bonjour": "3.5.0", - "chokidar": "2.0.4", - "compression": "1.7.3", - "connect-history-api-fallback": "1.5.0", - "debug": "3.2.6", - "del": "3.0.0", - "express": "4.16.4", - "html-entities": "1.2.1", - "http-proxy-middleware": "0.17.4", - "import-local": "1.0.0", - "internal-ip": "1.2.0", - "ip": "1.1.5", - "killable": "1.0.1", - "loglevel": "1.6.1", - "opn": "5.4.0", - "portfinder": "1.0.20", - "selfsigned": "1.10.4", - "serve-index": "1.9.1", - "sockjs": "0.3.19", - "sockjs-client": "1.1.5", - "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", @@ -15681,7 +11676,6 @@ "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" }, @@ -15698,15 +11692,9 @@ "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": { @@ -15715,11 +11703,7 @@ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { -<<<<<<< HEAD - "ms": "2.1.1" -======= "ms": "^2.1.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "find-up": { @@ -15728,13 +11712,8 @@ "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": { @@ -15743,11 +11722,7 @@ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "requires": { -<<<<<<< HEAD - "number-is-nan": "1.0.1" -======= "number-is-nan": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "load-json-file": { @@ -15756,19 +11731,11 @@ "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": { @@ -15783,11 +11750,7 @@ "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "dev": true, "requires": { -<<<<<<< HEAD - "lcid": "1.0.0" -======= "lcid": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "path-exists": { @@ -15796,11 +11759,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { -<<<<<<< HEAD - "pinkie-promise": "2.0.1" -======= "pinkie-promise": "^2.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "path-type": { @@ -15809,15 +11768,9 @@ "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": { @@ -15832,15 +11785,9 @@ "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": { @@ -15849,13 +11796,8 @@ "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": { @@ -15864,15 +11806,9 @@ "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": { @@ -15881,11 +11817,7 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { -<<<<<<< HEAD - "is-utf8": "0.2.1" -======= "is-utf8": "^0.2.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "which-module": { @@ -15906,21 +11838,6 @@ "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=", "dev": true, "requires": { -<<<<<<< HEAD - "camelcase": "3.0.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.3", - "os-locale": "1.4.0", - "read-pkg-up": "1.0.1", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "1.0.2", - "which-module": "1.0.0", - "y18n": "3.2.1", - "yargs-parser": "4.2.1" -======= "camelcase": "^3.0.0", "cliui": "^3.2.0", "decamelize": "^1.1.1", @@ -15934,7 +11851,6 @@ "which-module": "^1.0.0", "y18n": "^3.2.1", "yargs-parser": "^4.2.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "yargs-parser": { @@ -15943,11 +11859,7 @@ "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=", "dev": true, "requires": { -<<<<<<< HEAD - "camelcase": "3.0.0" -======= "camelcase": "^3.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } } } @@ -15958,11 +11870,7 @@ "integrity": "sha512-sVcM+MMJv6DO0C0GLLltx8mUlGMKXE0zBsuMqZ9jz2X9gsekALw6Rs0cAfTWc97VuWS6NpVUa78959zANnMMLQ==", "dev": true, "requires": { -<<<<<<< HEAD - "lodash": "4.17.11" -======= "lodash": "^4.17.5" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "webpack-sources": { @@ -15971,13 +11879,8 @@ "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": { @@ -15986,13 +11889,8 @@ "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": { @@ -16013,11 +11911,7 @@ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { -<<<<<<< HEAD - "isexe": "2.0.0" -======= "isexe": "^2.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "which-module": { @@ -16026,8 +11920,6 @@ "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", @@ -16037,7 +11929,6 @@ "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", @@ -16056,11 +11947,7 @@ "integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==", "dev": true, "requires": { -<<<<<<< HEAD - "errno": "0.1.7" -======= "errno": "~0.1.7" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "wrap-ansi": { @@ -16069,13 +11956,8 @@ "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": { @@ -16084,11 +11966,7 @@ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "requires": { -<<<<<<< HEAD - "number-is-nan": "1.0.1" -======= "number-is-nan": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "string-width": { @@ -16097,15 +11975,9 @@ "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 } } } @@ -16122,11 +11994,7 @@ "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=", "dev": true, "requires": { -<<<<<<< HEAD - "mkdirp": "0.5.1" -======= "mkdirp": "^0.5.1" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "ws": { @@ -16135,13 +12003,8 @@ "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": { @@ -16156,11 +12019,7 @@ "integrity": "sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==", "dev": true, "requires": { -<<<<<<< HEAD - "cuint": "0.2.2" -======= "cuint": "^0.2.2" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "y18n": { @@ -16181,21 +12040,6 @@ "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=", "dev": true, "requires": { -<<<<<<< HEAD - "camelcase": "4.1.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.3", - "os-locale": "2.1.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.1.1", - "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", @@ -16209,7 +12053,6 @@ "which-module": "^2.0.0", "y18n": "^3.2.1", "yargs-parser": "^7.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "camelcase": { @@ -16224,15 +12067,9 @@ "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": { @@ -16241,15 +12078,9 @@ "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 } } } @@ -16260,11 +12091,7 @@ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "requires": { -<<<<<<< HEAD - "number-is-nan": "1.0.1" -======= "number-is-nan": "^1.0.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c } }, "y18n": { @@ -16281,11 +12108,7 @@ "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", "dev": true, "requires": { -<<<<<<< HEAD - "camelcase": "4.1.0" -======= "camelcase": "^4.1.0" ->>>>>>> 12325f4c10f3badeed90236c05ee58b3404f4c6c }, "dependencies": { "camelcase": { diff --git a/src/pages/Cart.vue b/src/pages/Cart.vue index aa33116..b76d1f2 100644 --- a/src/pages/Cart.vue +++ b/src/pages/Cart.vue @@ -23,9 +23,9 @@ {{item.priced}}
-
-
+
-
{{item.count}} -
+
+
+
@@ -70,11 +70,29 @@ export default { .then(resp => { this.itemList = resp }) + // 猜你喜欢数据请求 接口在requests里 this.$http.getyouLike() .then(resp => { this.youLikeList = resp - console.log(this.itemList) }) + }, + methods : { + upHandler (id) { + this.itemList = this.itemList.map( item => { + if (item.id === id){ + item.count++ + }; + return item; + }) + }, + downHandler (id) { + this.itemList = this.itemList.map( item => { + if (item.id === id){ + item.count <= 1 ? item.count = 1 : item.count-- + }; + return item; + }) + } } } diff --git a/src/pages/mutations.js b/src/pages/mutations.js new file mode 100644 index 0000000..a69d39f --- /dev/null +++ b/src/pages/mutations.js @@ -0,0 +1,55 @@ +import * as mutationTypes from './mutationTypes' +export default { + [mutationTypes.addCartItemCount] (state, id) { + state.cart = state.cart.map(item => { + if (item.id === id) { + item.count++ + } + return item + }) + }, + [mutationTypes.reduceCartItemCount] (state, id) { + state.cart = state.cart.map(item => { + if (item.id === id && item.count > 1) { + item.count-- + } + return item + }) + }, + [mutationTypes.handleItemCheckedChange] (state, id) { + state.cart = state.cart.map(item => { + if (item.id === id) { + item.isChecked = !item.isChecked + } + return item + }) + }, + [mutationTypes.handleCartAllCheckedChange] (state, e) { + console.log(e.target.checked) + state.cart = state.cart.map(item => { + if (e.target.checked === true) { + item.isChecked = true + } else { + item.isChecked = false + } + return item + }) + }, + [mutationTypes.addToCart] (state, cartItem) { + const isInCart = state.cart.some(item => item.id === cartItem.id) + if (isInCart) { + state.cart = state.cart.map(item => { + if (item.id === cartItem.id) { + item.count += 1 + } + return item + }) + } else { + state.cart.push({ + ...cartItem, + count: 1, + isChecked: false + }) + } + } +} -- Gitee