From: RafiBomb Date: Tue, 2 Jan 2018 19:18:27 +0000 (-0800) Subject: fixes merge conflict on docs layout and updates footer copywrite X-Git-Tag: v2.3.0~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86845b30567ee492e596f398b6db12427fdbd057;p=thirdparty%2Ffoundation%2Ffoundation-emails.git fixes merge conflict on docs layout and updates footer copywrite --- 86845b30567ee492e596f398b6db12427fdbd057 diff --cc package-lock.json index 94bf7671,e98d7897..da822e2f --- a/package-lock.json +++ b/package-lock.json @@@ -2,17 -2,22 +2,34 @@@ "name": "foundation-emails", "version": "2.2.1", "lockfileVersion": 1, ++<<<<<<< HEAD ++======= + "requires": true, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "@gulp-sourcemaps/map-sources": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz", "integrity": "sha1-iQrnxdjId/bThIYCFazp1+yUW9o=", ++<<<<<<< HEAD + "dev": true + }, + "abab": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz", + "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=", ++======= + "dev": true, + "requires": { + "normalize-path": "2.1.1", + "through2": "2.0.3" + } + }, + "abab": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.3.tgz", + "integrity": "sha1-uB3l9ydOxOdW15fNg08wNkJyTl0=", ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dev": true, "optional": true }, @@@ -26,7 -31,11 +43,15 @@@ "version": "1.3.4", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz", "integrity": "sha1-hiRnWMfdbSGmR0/whKR0DsBesh8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "mime-types": "2.1.17", + "negotiator": "0.6.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "acorn": { "version": "2.7.0", @@@ -39,13 -48,19 +64,26 @@@ "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz", "integrity": "sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=", "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "acorn": "2.7.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "acorn-jsx": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "acorn": "3.3.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "acorn": { "version": "3.3.0", @@@ -65,7 -80,11 +103,15 @@@ "version": "4.11.8", "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "ajv-keywords": { "version": "1.5.1", @@@ -77,7 -96,12 +123,16 @@@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "alphanum-sort": { "version": "1.0.2", @@@ -96,6 -120,9 +151,12 @@@ "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz", "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "string-width": "2.1.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "ansi-regex": { "version": "3.0.0", @@@ -113,13 -140,20 +174,28 @@@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "strip-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -145,7 -179,11 +221,15 @@@ "version": "1.3.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "micromatch": "2.3.11", + "normalize-path": "2.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "aproba": { "version": "1.2.0", @@@ -163,19 -201,29 +247,41 @@@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz", "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "delegates": "1.0.0", + "readable-stream": "2.3.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "argparse": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "sprintf-js": "1.0.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "arr-diff": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "arr-flatten": "1.1.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "arr-flatten": { "version": "1.1.0", @@@ -187,7 -235,10 +293,14 @@@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz", "integrity": "sha1-ZEun8JX3/898Q7Xw3DnTwfA8Bjs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "typical": "2.6.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "array-differ": { "version": "1.0.0", @@@ -223,7 -274,10 +336,14 @@@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "array-uniq": "1.0.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "array-uniq": { "version": "1.0.3", @@@ -308,24 -362,45 +428,60 @@@ "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz", "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "browserslist": "1.7.7", + "caniuse-db": "1.0.30000733", + "normalize-range": "0.1.2", + "num2fraction": "1.2.2", + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "browserslist": { "version": "1.7.7", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "caniuse-db": "1.0.30000733", + "electron-to-chromium": "1.3.21" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "postcss": { "version": "5.2.17", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "has-flag": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -333,7 -408,13 +489,17 @@@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/autoprefixer-core/-/autoprefixer-core-5.2.1.tgz", "integrity": "sha1-5kDEFK5Bmq4hwa1DyOoPPbgqVm0=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "browserslist": "0.4.0", + "caniuse-db": "1.0.30000733", + "num2fraction": "1.2.2", + "postcss": "4.1.16" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "aws-sign2": { "version": "0.6.0", @@@ -351,7 -432,11 +517,15 @@@ "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "core-js": "2.5.1", + "regenerator-runtime": "0.11.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "babylon": { "version": "7.0.0-beta.19", @@@ -394,7 -479,10 +568,14 @@@ "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "tweetnacl": "0.14.5" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "beeper": { "version": "1.1.1", @@@ -406,7 -494,10 +587,14 @@@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz", "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "callsite": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "binary-extensions": { "version": "1.10.0", @@@ -424,7 -515,10 +612,14 @@@ "version": "0.0.9", "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "inherits": "2.0.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "bluebird": { "version": "3.5.0", @@@ -442,13 -536,25 +637,32 @@@ "version": "2.10.1", "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "hoek": "2.16.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "boxen": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.2.1.tgz", "integrity": "sha1-DxHn/jRO25OXl3/BPt5/ZNlWSB0=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "ansi-align": "2.0.0", + "camelcase": "4.1.0", + "chalk": "2.1.0", + "cli-boxes": "1.0.0", + "string-width": "2.1.1", + "term-size": "1.2.0", + "widest-line": "1.0.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "ansi-regex": { "version": "3.0.0", @@@ -460,7 -566,10 +674,14 @@@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "color-convert": "1.9.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "camelcase": { "version": "4.1.0", @@@ -472,7 -581,12 +693,16 @@@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz", "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.4.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "has-flag": { "version": "2.0.0", @@@ -490,19 -604,29 +720,41 @@@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "strip-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "supports-color": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "has-flag": "2.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -510,37 -634,89 +762,113 @@@ "version": "1.1.8", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "braces": { "version": "1.8.5", "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "expand-range": "1.8.2", + "preserve": "0.2.0", + "repeat-element": "1.1.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "browser-sync": { "version": "2.18.13", "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-2.18.13.tgz", "integrity": "sha512-qhdrmgshVGwweogT/bdOKkZDxVxqiF4+9mibaDeAxvDBeoUtdgABk5x7YQ1KCcLRchAfv8AVtp9NuITl5CTNqg==", - "dev": true ++<<<<<<< HEAD ++ "dev": true ++======= + "dev": true, + "requires": { + "browser-sync-client": "2.5.1", + "browser-sync-ui": "0.6.3", + "bs-recipes": "1.3.4", + "chokidar": "1.7.0", + "connect": "3.5.0", + "dev-ip": "1.0.1", + "easy-extender": "2.3.2", + "eazy-logger": "3.0.2", + "emitter-steward": "1.0.0", + "fs-extra": "3.0.1", + "http-proxy": "1.15.2", + "immutable": "3.8.1", + "localtunnel": "1.8.3", + "micromatch": "2.3.11", + "opn": "4.0.2", + "portscanner": "2.1.1", + "qs": "6.2.1", + "resp-modifier": "6.0.2", + "rx": "4.1.0", + "serve-index": "1.8.0", + "serve-static": "1.12.2", + "server-destroy": "1.0.1", + "socket.io": "1.6.0", + "socket.io-client": "1.6.0", + "ua-parser-js": "0.7.12", + "yargs": "6.4.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "browser-sync-client": { "version": "2.5.1", "resolved": "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.5.1.tgz", "integrity": "sha1-7BrWmknC4tS2RbGLHAbCmz2a+Os=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "etag": "1.8.1", + "fresh": "0.3.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "browser-sync-ui": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-0.6.3.tgz", "integrity": "sha1-ZApTfBgGiTA9W+krxHa568RBwLw=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "async-each-series": "0.1.1", + "connect-history-api-fallback": "1.3.0", + "immutable": "3.8.1", + "server-destroy": "1.0.1", + "stream-throttle": "0.1.3", + "weinre": "2.0.0-pre-I0Z7U9OV" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "browserslist": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-0.4.0.tgz", "integrity": "sha1-O9SrkZncG5FQ1NbbpNnTqrvIbdQ=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "caniuse-db": "1.0.30000733" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "bs-recipes": { "version": "1.3.4", @@@ -558,7 -734,10 +886,14 @@@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.1.1.tgz", "integrity": "sha1-AWE3MGCsWYjv+ZBYcxEU9uGV1R4=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "readable-stream": "2.3.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "builtin-modules": { "version": "1.1.1", @@@ -571,6 -750,13 +906,16 @@@ "resolved": "https://registry.npmjs.org/cache-point/-/cache-point-0.3.4.tgz", "integrity": "sha1-FS21Asa7I7WqP2Y+Iw1d6OxOTz8=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "array-back": "1.0.4", + "core-js": "2.5.1", + "feature-detect-es6": "1.3.1", + "fs-then-native": "1.0.2", + "mkdirp": "0.5.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "minimist": { "version": "0.0.8", @@@ -582,7 -768,10 +927,14 @@@ "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "minimist": "0.0.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -590,7 -779,10 +942,14 @@@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "callsites": "0.2.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "callsite": { "version": "1.0.0", @@@ -608,7 -800,11 +967,15 @@@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-1.2.2.tgz", "integrity": "sha1-Gsp8TRlTWaLOmVV5NDPG5VQlEfI=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "sentence-case": "1.1.3", + "upper-case": "1.1.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "camelcase": { "version": "1.2.1", @@@ -621,6 -817,10 +988,13 @@@ "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "camelcase": "2.1.1", + "map-obj": "1.0.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "camelcase": { "version": "2.1.1", @@@ -635,12 -835,22 +1009,29 @@@ "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz", "integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "browserslist": "1.7.7", + "caniuse-db": "1.0.30000733", + "lodash.memoize": "4.1.2", + "lodash.uniq": "4.5.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "browserslist": { "version": "1.7.7", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "caniuse-db": "1.0.30000733", + "electron-to-chromium": "1.3.21" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -672,25 -882,43 +1063,58 @@@ "version": "0.8.9", "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.9.tgz", "integrity": "sha1-mMyJDKZS3S7w5ws3klMQ/56Q/Is=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "underscore-contrib": "0.3.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "cdocparser": { "version": "0.13.0", "resolved": "https://registry.npmjs.org/cdocparser/-/cdocparser-0.13.0.tgz", "integrity": "sha1-G6mKHh4WaOK/s11Bdh6eRkXXMbo=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "escape-string-regexp": "1.0.5", + "lodash.assign": "2.4.1", + "strip-indent": "1.0.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "lodash.assign": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-2.4.1.tgz", "integrity": "sha1-hMOVlt1xGBqXsGUpE6fJZ15Jsao=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lodash._basecreatecallback": "2.4.1", + "lodash._objecttypes": "2.4.1", + "lodash.keys": "2.4.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lodash.keys": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lodash._isnative": "2.4.1", + "lodash._shimkeys": "2.4.1", + "lodash.isobject": "2.4.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -698,31 -926,78 +1122,98 @@@ "version": "0.1.3", "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "align-text": "0.1.4", + "lazy-cache": "1.0.4" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "chalk": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "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" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "change-case": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/change-case/-/change-case-2.3.1.tgz", "integrity": "sha1-LE/ePwY7tB0AzWjg1aCdthy+iU8=", - "dev": true ++<<<<<<< HEAD ++ "dev": true ++======= + "dev": true, + "requires": { + "camel-case": "1.2.2", + "constant-case": "1.1.2", + "dot-case": "1.1.2", + "is-lower-case": "1.1.3", + "is-upper-case": "1.1.2", + "lower-case": "1.1.4", + "lower-case-first": "1.0.2", + "param-case": "1.1.2", + "pascal-case": "1.1.2", + "path-case": "1.1.2", + "sentence-case": "1.1.3", + "snake-case": "1.1.2", + "swap-case": "1.1.2", + "title-case": "1.1.2", + "upper-case": "1.1.3", + "upper-case-first": "1.1.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "cheerio": { "version": "0.19.0", "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz", "integrity": "sha1-dy5wFfLuKZZQltcepBdbdas1SSU=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "css-select": "1.0.0", + "dom-serializer": "0.1.0", + "entities": "1.1.1", + "htmlparser2": "3.8.3", + "lodash": "3.10.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "chokidar": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "anymatch": "1.3.2", + "async-each": "1.0.1", + "fsevents": "1.1.2", + "glob-parent": "2.0.0", + "inherits": "2.0.3", + "is-binary-path": "1.0.1", + "is-glob": "2.0.1", + "path-is-absolute": "1.0.1", + "readdirp": "2.1.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "chroma-js": { "version": "1.3.4", @@@ -740,25 -1015,38 +1231,53 @@@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz", "integrity": "sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "clean-css": { "version": "3.4.28", "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz", "integrity": "sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "commander": "2.8.1", + "source-map": "0.4.4" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "commander": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz", "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "graceful-readlink": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "source-map": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "amdefine": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -772,13 -1060,20 +1291,28 @@@ "version": "0.2.3", "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-0.2.3.tgz", "integrity": "sha1-CiXOrlpqFgK+f3fShWPDZwAnTog=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "es5-ext": "0.9.2", + "memoizee": "0.2.6" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "cli-cursor": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz", "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "restore-cursor": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "cli-width": { "version": "2.2.0", @@@ -796,7 -1091,12 +1330,16 @@@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "clone": { "version": "1.0.2", @@@ -820,7 -1120,12 +1363,16 @@@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.0.0.tgz", "integrity": "sha1-pikNQT8hemEjL5XkWP84QYz7ARc=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "inherits": "2.0.3", + "process-nextick-args": "1.0.7", + "through2": "2.0.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "co": { "version": "4.6.0", @@@ -832,7 -1137,10 +1384,14 @@@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz", "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "q": "1.5.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "code-point-at": { "version": "1.1.0", @@@ -844,19 -1152,31 +1403,43 @@@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/collect-all/-/collect-all-1.0.3.tgz", "integrity": "sha512-0y0rBgoX8IzIjBAUnO73SEtSb4Mhk3IoceWJq5zZSxb9mWORhWH8xLYo4EDSOE1jRBk1LhmfjqWFFt10h/+MEA==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "stream-connect": "1.0.2", + "stream-via": "1.0.4" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "color": { "version": "0.11.4", "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz", "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "clone": "1.0.2", + "color-convert": "1.9.0", + "color-string": "0.3.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "color-convert": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz", "integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "color-name": "1.1.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "color-name": { "version": "1.1.3", @@@ -868,13 -1188,21 +1451,29 @@@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz", "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "color-name": "1.1.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "colormin": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz", "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "color": "0.11.4", + "css-color-names": "0.0.4", + "has": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "colors": { "version": "1.1.2", @@@ -886,7 -1214,10 +1485,14 @@@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "delayed-stream": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "commander": { "version": "2.11.0", @@@ -923,12 -1254,25 +1529,32 @@@ "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz", "integrity": "sha1-cIl4Yk2FavQaWnQd790mHadSwmY=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.0.6", + "typedarray": "0.0.6" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "readable-stream": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "string_decoder": "0.10.31", + "util-deprecate": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "string_decoder": { "version": "0.10.31", @@@ -942,25 -1286,46 +1568,62 @@@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.0.4.tgz", "integrity": "sha1-9Vs74q60dgGxCi1SWcz7cP0vHdY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "source-map": "0.5.7" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "config-chain": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz", "integrity": "sha1-q6CXR9++TD5w52am5BWG4YWfxvI=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "ini": "1.3.4", + "proto-list": "1.2.4" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "configstore": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz", "integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "dot-prop": "4.2.0", + "graceful-fs": "4.1.11", + "make-dir": "1.0.0", + "unique-string": "1.0.0", + "write-file-atomic": "2.3.0", + "xdg-basedir": "3.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "connect": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/connect/-/connect-3.5.0.tgz", "integrity": "sha1-s1dSWgtMH1BZnNmD4dnv7qlncZg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "debug": "2.2.0", + "finalhandler": "0.5.0", + "parseurl": "1.3.2", + "utils-merge": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "connect-history-api-fallback": { "version": "1.3.0", @@@ -984,7 -1349,11 +1647,15 @@@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-1.1.2.tgz", "integrity": "sha1-jsLKW6ND4Aqjjb9OIA/VrJB+/WM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "snake-case": "1.1.2", + "upper-case": "1.1.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "convert-source-map": { "version": "1.5.0", @@@ -1020,19 -1389,30 +1691,41 @@@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz", "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "capture-stack-trace": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "cross-spawn": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "lru-cache": "4.1.1", + "which": "1.3.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "lru-cache": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "pseudomap": "1.0.2", + "yallist": "2.1.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -1040,7 -1420,10 +1733,14 @@@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "boom": "2.10.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "crypto-random-string": { "version": "1.0.0", @@@ -1053,12 -1436,21 +1753,28 @@@ "resolved": "https://registry.npmjs.org/css/-/css-2.2.1.tgz", "integrity": "sha1-c6TIHehdtmTU7mdPfUcIXjstVdw=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "inherits": "2.0.3", + "source-map": "0.1.43", + "source-map-resolve": "0.3.1", + "urix": "0.1.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "source-map": { "version": "0.1.43", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "amdefine": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -1072,7 -1464,10 +1788,14 @@@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz", "integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "css": "2.2.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "css-property": { "version": "1.0.2", @@@ -1084,19 -1479,31 +1807,43 @@@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/css-rules/-/css-rules-1.0.2.tgz", "integrity": "sha1-8tBURMCSfaCeRtHKaVr4Gm/FJdk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "cssom": "0.3.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "css-select": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz", "integrity": "sha1-sRIcpRhI3SZOIkTQWM7iVN7rRLA=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "boolbase": "1.0.0", + "css-what": "1.0.0", + "domutils": "1.4.3", + "nth-check": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "css-stringify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/css-stringify/-/css-stringify-2.0.0.tgz", "integrity": "sha1-LvM9z0mMPT7oK9c9CgGsKGKM0Po=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "css": "2.2.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "css-what": { "version": "1.0.0", @@@ -1109,18 -1516,61 +1856,72 @@@ "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz", "integrity": "sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "autoprefixer": "6.7.7", + "decamelize": "1.2.0", + "defined": "1.0.0", + "has": "1.0.1", + "object-assign": "4.1.1", + "postcss": "5.2.17", + "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.2", + "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.0", + "postcss-zindex": "2.2.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "postcss": { "version": "5.2.17", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "has-flag": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -1128,7 -1578,11 +1929,15 @@@ "version": "2.3.2", "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz", "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "clap": "1.2.3", + "source-map": "0.5.7" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "cssom": { "version": "0.3.2", @@@ -1141,25 -1595,38 +1950,53 @@@ "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz", "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=", "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "cssom": "0.3.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "currently-unhandled": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "array-find-index": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "d": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "es5-ext": "0.10.30" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "es5-ext": { "version": "0.10.30", "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.30.tgz", "integrity": "sha1-cUGhaDZpfbq/qq7uQUlc4p9SyTk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "es6-iterator": "2.0.1", + "es6-symbol": "3.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -1167,13 -1634,19 +2004,26 @@@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/dargs/-/dargs-4.1.0.tgz", "integrity": "sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "number-is-nan": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "assert-plus": "1.0.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "assert-plus": { "version": "1.0.0", @@@ -1184,22 -1657,30 +2034,43 @@@ } }, "dateformat": { ++<<<<<<< HEAD + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz", + "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=", ++======= + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz", + "integrity": "sha1-J0Pjq7XD/CRi5SfcpEXgTp9N7hc=", ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dev": true }, "debug": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "ms": "0.7.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "debug-fabulous": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-0.0.4.tgz", "integrity": "sha1-+gccXYdIRoVCSAdCHKSxawsaB2M=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "debug": "2.2.0", + "lazy-debug-legacy": "0.0.1", + "object-assign": "4.1.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "object-assign": { "version": "4.1.0", @@@ -1228,16 -1709,19 +2099,29 @@@ "dev": true }, "deepmerge": { ++<<<<<<< HEAD + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz", + "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==", ++======= + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.1.tgz", + "integrity": "sha512-Ndl8eeOHB9dQkmT1HWCgY3t0odl4bmWKFzjQZBYAxVTNs2B3nn5b6orimRYHKZ4FI8psvZkA1INRCW6l7vc9lQ==", ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dev": true }, "defaults": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "clone": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "defined": { "version": "1.0.0", @@@ -1249,7 -1733,16 +2133,20 @@@ "version": "2.2.2", "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "globby": "5.0.0", + "is-path-cwd": "1.0.0", + "is-path-in-cwd": "1.0.0", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "rimraf": "2.6.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "delayed-stream": { "version": "1.0.0", @@@ -1285,7 -1778,10 +2182,14 @@@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-0.1.0.tgz", "integrity": "sha1-STXe39lIhkjgBrASlWbpOGcR6mM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "fs-exists-sync": "0.1.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "detect-newline": { "version": "2.1.0", @@@ -1309,13 -1805,21 +2213,28 @@@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz", "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "esutils": "2.0.2", + "isarray": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "dom-serializer": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "domelementtype": "1.1.3", + "entities": "1.1.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "domelementtype": { "version": "1.1.3", @@@ -1335,25 -1839,37 +2254,53 @@@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz", "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "domelementtype": "1.3.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "domutils": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz", "integrity": "sha1-CGVRN5bGswYDGFDhdVFrr4C3Km8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "domelementtype": "1.3.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "dot-case": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-1.1.2.tgz", "integrity": "sha1-HnOCaQDeKNbeVIC8HeMdCEKwa+w=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "sentence-case": "1.1.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "dot-prop": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "is-obj": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "duplexer": { "version": "0.1.1", @@@ -1366,6 -1882,9 +2313,12 @@@ "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "readable-stream": "1.1.14" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "isarray": { "version": "0.0.1", @@@ -1377,7 -1896,13 +2330,17 @@@ "version": "1.1.14", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "string_decoder": { "version": "0.10.31", @@@ -1397,32 -1922,54 +2360,74 @@@ "version": "3.5.1", "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz", "integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "end-of-stream": "1.4.0", + "inherits": "2.0.3", + "readable-stream": "2.3.3", + "stream-shift": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "easy-extender": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/easy-extender/-/easy-extender-2.3.2.tgz", "integrity": "sha1-PTJI/r4rFZYHMW2PnPSRwWZIIh0=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lodash": "3.10.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "eazy-logger": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/eazy-logger/-/eazy-logger-3.0.2.tgz", "integrity": "sha1-oyWqXlPROiIliJsqxBE7K5Y29Pw=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "tfunk": "3.1.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "ecc-jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "jsbn": "0.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "editorconfig": { "version": "0.13.3", "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz", "integrity": "sha512-WkjsUNVCu+ITKDj73QDvi0trvpdDWdkDyHybDGSXPfekLCqwmpD7CP7iPbvBgosNuLcI96XTDwNa75JyFl7tEQ==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "bluebird": "3.5.0", + "commander": "2.11.0", + "lru-cache": "3.2.0", + "semver": "5.4.1", + "sigmund": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "ee-first": { "version": "1.1.1", @@@ -1452,7 -1999,10 +2457,14 @@@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz", "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "once": "1.4.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "ends-with": { "version": "0.2.0", @@@ -1465,18 -2015,33 +2477,44 @@@ "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.8.0.tgz", "integrity": "sha1-PutfJky3XbvsG6rqJtYfWk6s4qo=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "accepts": "1.3.3", + "base64id": "0.1.0", + "cookie": "0.3.1", + "debug": "2.3.3", + "engine.io-parser": "1.3.1", + "ws": "1.1.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "accepts": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz", "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "mime-types": "2.1.17", + "negotiator": "0.6.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "debug": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "ms": "0.7.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "ms": { "version": "0.7.2", @@@ -1491,6 -2056,20 +2529,23 @@@ "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.0.tgz", "integrity": "sha1-e3MOQSdBQIdZbZvjyI0rxf22z1w=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "component-emitter": "1.2.1", + "component-inherit": "0.0.3", + "debug": "2.3.3", + "engine.io-parser": "1.3.1", + "has-cors": "1.1.0", + "indexof": "0.0.1", + "parsejson": "0.0.3", + "parseqs": "0.0.5", + "parseuri": "0.0.5", + "ws": "1.1.1", + "xmlhttprequest-ssl": "1.5.3", + "yeast": "0.1.2" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "component-emitter": { "version": "1.2.1", @@@ -1502,7 -2081,10 +2557,14 @@@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "ms": "0.7.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "ms": { "version": "0.7.2", @@@ -1517,12 -2099,23 +2579,30 @@@ "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.1.tgz", "integrity": "sha1-lVTxrjMQfW+9FwylRm0vgz9qB88=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "after": "0.8.1", + "arraybuffer.slice": "0.0.6", + "base64-arraybuffer": "0.1.5", + "blob": "0.0.4", + "has-binary": "0.1.6", + "wtf-8": "1.0.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "has-binary": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz", "integrity": "sha1-JTJvOc+k9hath4eJTjryz7x7bhA=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "isarray": "0.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "isarray": { "version": "0.0.1", @@@ -1542,7 -2135,10 +2622,14 @@@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "is-arrayish": "0.2.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "es5-ext": { "version": "0.9.2", @@@ -1561,12 -2157,21 +2648,28 @@@ "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz", "integrity": "sha1-jjGcnwRTv1ddN0lAplWSDlnKVRI=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.30", + "es6-symbol": "3.1.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "es5-ext": { "version": "0.10.30", "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.30.tgz", "integrity": "sha1-cUGhaDZpfbq/qq7uQUlc4p9SyTk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "es6-iterator": "2.0.1", + "es6-symbol": "3.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -1575,18 -2180,34 +2678,45 @@@ "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz", "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.30", + "es6-iterator": "2.0.1", + "es6-set": "0.1.5", + "es6-symbol": "3.1.1", + "event-emitter": "0.3.5" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "es5-ext": { "version": "0.10.30", "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.30.tgz", "integrity": "sha1-cUGhaDZpfbq/qq7uQUlc4p9SyTk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "es6-iterator": "2.0.1", + "es6-symbol": "3.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "event-emitter": { "version": "0.3.5", "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.30" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -1601,18 -2222,33 +2731,44 @@@ "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz", "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.30", + "es6-iterator": "2.0.1", + "es6-symbol": "3.1.1", + "event-emitter": "0.3.5" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "es5-ext": { "version": "0.10.30", "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.30.tgz", "integrity": "sha1-cUGhaDZpfbq/qq7uQUlc4p9SyTk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "es6-iterator": "2.0.1", + "es6-symbol": "3.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "event-emitter": { "version": "0.3.5", "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.30" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -1621,12 -2257,20 +2777,27 @@@ "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz", "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.30" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "es5-ext": { "version": "0.10.30", "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.30.tgz", "integrity": "sha1-cUGhaDZpfbq/qq7uQUlc4p9SyTk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "es6-iterator": "2.0.1", + "es6-symbol": "3.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -1635,12 -2279,22 +2806,29 @@@ "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz", "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.30", + "es6-iterator": "2.0.1", + "es6-symbol": "3.1.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "es5-ext": { "version": "0.10.30", "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.30.tgz", "integrity": "sha1-cUGhaDZpfbq/qq7uQUlc4p9SyTk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "es6-iterator": "2.0.1", + "es6-symbol": "3.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -1661,31 -2315,102 +2849,121 @@@ "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz", "integrity": "sha512-v0MYvNQ32bzwoG2OSFzWAkuahDQHK92JBN0pTAALJ4RIxEZe766QJPDR8Hqy7XNUy5K3fnVL76OqYAdc4TZEIw==", "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "esprima": "3.1.3", + "estraverse": "4.2.0", + "esutils": "2.0.2", + "optionator": "0.8.2", + "source-map": "0.5.7" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "escope": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz", "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "es6-map": "0.1.5", + "es6-weak-map": "2.0.2", + "esrecurse": "4.2.0", + "estraverse": "4.2.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "eslint": { "version": "2.13.1", "resolved": "https://registry.npmjs.org/eslint/-/eslint-2.13.1.tgz", "integrity": "sha1-5MyPoPAJ+4KaquI4VaKTYL4fbBE=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "chalk": "1.1.3", + "concat-stream": "1.5.2", + "debug": "2.2.0", + "doctrine": "1.5.0", + "es6-map": "0.1.5", + "escope": "3.6.0", + "espree": "3.5.1", + "estraverse": "4.2.0", + "esutils": "2.0.2", + "file-entry-cache": "1.3.1", + "glob": "7.1.2", + "globals": "9.18.0", + "ignore": "3.3.5", + "imurmurhash": "0.1.4", + "inquirer": "0.12.0", + "is-my-json-valid": "2.16.1", + "is-resolvable": "1.0.0", + "js-yaml": "3.7.0", + "json-stable-stringify": "1.0.1", + "levn": "0.3.0", + "lodash": "4.17.4", + "mkdirp": "0.5.1", + "optionator": "0.8.2", + "path-is-absolute": "1.0.1", + "path-is-inside": "1.0.2", + "pluralize": "1.2.1", + "progress": "1.1.8", + "require-uncached": "1.0.3", + "shelljs": "0.6.1", + "strip-json-comments": "1.0.4", + "table": "3.8.3", + "text-table": "0.2.0", + "user-home": "2.0.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "glob": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "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" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "inquirer": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz", "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "ansi-escapes": "1.4.0", + "ansi-regex": "2.1.1", + "chalk": "1.1.3", + "cli-cursor": "1.0.2", + "cli-width": "2.2.0", + "figures": "1.7.0", + "lodash": "4.17.4", + "readline2": "1.0.1", + "run-async": "0.1.0", + "rx-lite": "3.1.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "through": "2.3.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lodash": { "version": "4.17.4", @@@ -1703,13 -2428,19 +2981,27 @@@ "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "minimist": "0.0.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "user-home": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz", "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "os-homedir": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -1718,6 -2449,10 +3010,13 @@@ "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.1.tgz", "integrity": "sha1-DJiLirRttTEAoZVK5LqZXd0n2H4=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "acorn": "5.1.2", + "acorn-jsx": "3.0.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "acorn": { "version": "5.1.2", @@@ -1738,7 -2473,11 +3037,15 @@@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz", "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "estraverse": "4.2.0", + "object-assign": "4.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "estraverse": { "version": "4.2.0", @@@ -1762,13 -2501,25 +3069,33 @@@ "version": "0.2.2", "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.2.2.tgz", "integrity": "sha1-yB43JOtVQHxaDV7jKZQR9wD1QpE=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "es5-ext": "0.9.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "event-stream": { "version": "3.3.4", "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "duplexer": "0.1.1", + "from": "0.1.7", + "map-stream": "0.1.0", + "pause-stream": "0.0.11", + "split": "0.3.3", + "stream-combiner": "0.0.4", + "through": "2.3.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "eventemitter3": { "version": "1.2.0", @@@ -1781,18 -2532,36 +3108,47 @@@ "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "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" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lru-cache": "4.1.1", + "shebang-command": "1.2.0", + "which": "1.3.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lru-cache": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "pseudomap": "1.0.2", + "yallist": "2.1.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -1806,31 -2575,51 +3162,70 @@@ "version": "0.1.5", "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "is-posix-bracket": "0.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "expand-range": { "version": "1.8.2", "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "fill-range": "2.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "expand-tilde": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz", "integrity": "sha1-C4HrqJflo9MdHD0QL48BRB5VlEk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "os-homedir": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "express": { "version": "2.5.11", "resolved": "https://registry.npmjs.org/express/-/express-2.5.11.tgz", "integrity": "sha1-TOjqHzY15p5J8Ou0l7aksKUc5vA=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "connect": "1.9.2", + "mime": "1.2.4", + "mkdirp": "0.3.0", + "qs": "0.4.2" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "connect": { "version": "1.9.2", "resolved": "https://registry.npmjs.org/connect/-/connect-1.9.2.tgz", "integrity": "sha1-QogKIulDiuWait105Df1iujlKAc=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "formidable": "1.0.17", + "mime": "1.2.4", + "qs": "0.4.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "qs": { "version": "0.4.2", @@@ -1850,20 -2639,32 +3245,44 @@@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "extglob": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "extract-css": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/extract-css/-/extract-css-1.0.3.tgz", "integrity": "sha1-rKe4S/fhOKXfqyuQJKSZVJ+TUEY=", ++<<<<<<< HEAD + "dev": true - }, ++======= + "dev": true, + "requires": { + "batch": "0.5.3", + "href-content": "1.0.2", + "list-stylesheets": "1.1.0", + "style-data": "1.1.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 + }, "extsprintf": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", @@@ -1874,7 -2675,11 +3293,15 @@@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz", "integrity": "sha1-Rb4X0Cu5kX1gzP/UmVyZnmyMmUg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "time-stamp": "1.1.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "fast-levenshtein": { "version": "2.0.6", @@@ -1886,31 -2691,54 +3313,73 @@@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/feature-detect-es6/-/feature-detect-es6-1.3.1.tgz", "integrity": "sha1-+IhzavnLDJH1VmO/pHYuuW7nBH8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "array-back": "1.0.4" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "figures": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "escape-string-regexp": "1.0.5", + "object-assign": "4.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "file-entry-cache": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-1.3.1.tgz", "integrity": "sha1-RMYepgeuS+nBQC9B9EJwy/4zT/g=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "flat-cache": "1.2.2", + "object-assign": "4.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "file-set": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/file-set/-/file-set-1.1.1.tgz", "integrity": "sha1-0+xwwIDsjxjyBLod4QZ4DJBWkms=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "array-back": "1.0.4", + "glob": "7.1.2" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "glob": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "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" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -1924,13 -2752,27 +3393,35 @@@ "version": "2.2.3", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "is-number": "2.1.0", + "isobject": "2.1.0", + "randomatic": "1.1.7", + "repeat-element": "1.1.2", + "repeat-string": "1.6.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "finalhandler": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz", "integrity": "sha1-6VCKvs6bbbqHGmlCodeRG5GRGsc=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "debug": "2.2.0", + "escape-html": "1.0.3", + "on-finished": "2.3.0", + "statuses": "1.3.1", + "unpipe": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "find-index": { "version": "0.1.1", @@@ -1942,25 -2784,45 +3433,60 @@@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "findup-sync": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.4.3.tgz", "integrity": "sha1-QAQ5Kee8YK3wt/SCfExudaDeyhI=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "detect-file": "0.1.0", + "is-glob": "2.0.1", + "micromatch": "2.3.11", + "resolve-dir": "0.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "fined": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz", "integrity": "sha1-s33IRLdqL15wgeiE98CuNE8VNHY=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "expand-tilde": "2.0.2", + "is-plain-object": "2.0.4", + "object.defaults": "1.1.0", + "object.pick": "1.3.0", + "parse-filepath": "1.0.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "expand-tilde": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "homedir-polyfill": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -1980,7 -2842,13 +3506,17 @@@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz", "integrity": "sha1-+oZxTnLCHbiGAXYezy9VXRq8a5Y=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "circular-json": "0.3.3", + "del": "2.2.2", + "graceful-fs": "4.1.11", + "write": "0.2.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "flatten": { "version": "1.0.2", @@@ -1998,7 -2866,10 +3534,14 @@@ "version": "0.1.5", "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "for-in": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "forever-agent": { "version": "0.6.1", @@@ -2016,7 -2887,12 +3559,16 @@@ "version": "2.1.4", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.5", + "mime-types": "2.1.17" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "formidable": { "version": "1.0.17", @@@ -2025,20 -2901,49 +3577,62 @@@ "dev": true }, "foundation-docs": { ++<<<<<<< HEAD + "version": "github:zurb/foundation-docs#c755ceb863cd41928fe59e2a1f14a82643e16355", + "dev": true, ++======= + "version": "git+https://github.com/zurb/foundation-docs.git#856ca900f5fae6557a74530d1eeaf7b244736d28", + "dev": true, + "requires": { + "cheerio": "0.20.0", + "handlebars": "3.0.3", + "highlight.js": "9.12.0", + "inky": "github:zurb/inky#f085b50b52f7b27b8bf70afec06eb615d3f2c18c", + "js-beautify": "1.7.3", + "kebab-case": "1.0.0", + "marked": "0.3.6", + "mkdirp": "0.5.1", + "multiline": "1.0.2", + "querystring": "0.2.0", + "require-dir": "0.3.2", + "string-template": "1.0.0", + "strip-indent": "1.0.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "cheerio": { "version": "0.20.0", "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.20.0.tgz", "integrity": "sha1-XHEPK6uVZTJyhCugHG6mGzVF7DU=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "css-select": "1.2.0", + "dom-serializer": "0.1.0", + "entities": "1.1.1", + "htmlparser2": "3.8.3", + "jsdom": "7.2.2", + "lodash": "4.17.4" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "css-select": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "boolbase": "1.0.0", + "css-what": "2.1.0", + "domutils": "1.5.1", + "nth-check": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "css-what": { "version": "2.1.0", @@@ -2050,7 -2955,11 +3644,15 @@@ "version": "1.5.1", "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "dom-serializer": "0.1.0", + "domelementtype": "1.3.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lodash": { "version": "4.17.4", @@@ -2068,7 -2977,10 +3670,14 @@@ "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "minimist": "0.0.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -2082,7 -2994,11 +3691,15 @@@ "version": "6.4.3", "resolved": "https://registry.npmjs.org/foundation-sites/-/foundation-sites-6.4.3.tgz", "integrity": "sha1-6onrWZut9vA91SbFHwC9uUKoRPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "jquery": "3.2.1", + "what-input": "4.3.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "fresh": { "version": "0.3.0", @@@ -2100,7 -3016,10 +3717,14 @@@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/front-matter/-/front-matter-2.1.2.tgz", "integrity": "sha1-91mDufL0E75ljJPf172M5AePXNs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "js-yaml": "3.7.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "fs-exists-sync": { "version": "0.1.0", @@@ -2112,19 -3031,31 +3736,42 @@@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz", "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "3.0.1", + "universalify": "0.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "fs-readfile-promise": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/fs-readfile-promise/-/fs-readfile-promise-1.1.0.tgz", "integrity": "sha1-UVT4/4hydwfWcwpVjSUYfXupD88=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "es6-promise": "2.3.0", + "graceful-fs": "3.0.11" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "graceful-fs": { "version": "3.0.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz", "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "natives": "1.1.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -2132,7 -3063,10 +3779,14 @@@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/fs-then-native/-/fs-then-native-1.0.2.tgz", "integrity": "sha1-rI04B8nxu9Enlgf7Io4Ktkm7Qf4=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "feature-detect-es6": "1.3.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "fs.realpath": { "version": "1.0.0", @@@ -2146,6 -3080,10 +3800,13 @@@ "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==", "dev": true, "optional": true, ++<<<<<<< HEAD ++======= + "requires": { + "nan": "2.7.0", + "node-pre-gyp": "0.6.36" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "abbrev": { "version": "1.1.0", @@@ -2157,7 -3095,11 +3818,15 @@@ "version": "4.11.8", "bundled": true, "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "ansi-regex": { "version": "2.1.1", @@@ -2174,7 -3116,11 +3843,15 @@@ "version": "1.1.4", "bundled": true, "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "delegates": "1.0.0", + "readable-stream": "2.2.9" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "asn1": { "version": "0.2.3", @@@ -2215,22 -3161,35 +3892,51 @@@ "version": "1.0.1", "bundled": true, "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "tweetnacl": "0.14.5" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "block-stream": { "version": "0.0.9", "bundled": true, ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "inherits": "2.0.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "boom": { "version": "2.10.1", "bundled": true, ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "hoek": "2.16.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "brace-expansion": { "version": "1.1.7", "bundled": true, ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "balanced-match": "0.4.2", + "concat-map": "0.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "buffer-shims": { "version": "1.0.0", @@@ -2257,7 -3216,10 +3963,14 @@@ "combined-stream": { "version": "1.0.5", "bundled": true, ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "delayed-stream": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "concat-map": { "version": "0.0.1", @@@ -2278,13 -3240,19 +3991,26 @@@ "version": "2.0.5", "bundled": true, "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "boom": "2.10.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "dashdash": { "version": "1.14.1", "bundled": true, "dev": true, "optional": true, ++<<<<<<< HEAD ++======= + "requires": { + "assert-plus": "1.0.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "assert-plus": { "version": "1.0.0", @@@ -2298,7 -3266,10 +4024,14 @@@ "version": "2.6.8", "bundled": true, "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "ms": "2.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "deep-extend": { "version": "0.4.2", @@@ -2321,7 -3292,10 +4054,14 @@@ "version": "0.1.1", "bundled": true, "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "jsbn": "0.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "extend": { "version": "3.0.1", @@@ -2344,7 -3318,12 +4084,16 @@@ "version": "2.1.4", "bundled": true, "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.5", + "mime-types": "2.1.15" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "fs.realpath": { "version": "1.0.0", @@@ -2354,25 -3333,49 +4103,64 @@@ "fstream": { "version": "1.0.11", "bundled": true, ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "inherits": "2.0.3", + "mkdirp": "0.5.1", + "rimraf": "2.6.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "fstream-ignore": { "version": "1.0.5", "bundled": true, "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "fstream": "1.0.11", + "inherits": "2.0.3", + "minimatch": "3.0.4" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "gauge": { "version": "2.7.4", "bundled": true, "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "aproba": "1.1.1", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "getpass": { "version": "0.1.7", "bundled": true, "dev": true, "optional": true, ++<<<<<<< HEAD ++======= + "requires": { + "assert-plus": "1.0.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "assert-plus": { "version": "1.0.0", @@@ -2385,7 -3388,15 +4173,19 @@@ "glob": { "version": "7.1.2", "bundled": true, ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "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" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "graceful-fs": { "version": "4.1.11", @@@ -2402,7 -3413,11 +4202,15 @@@ "version": "4.2.1", "bundled": true, "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "ajv": "4.11.8", + "har-schema": "1.0.5" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "has-unicode": { "version": "2.0.1", @@@ -2414,7 -3429,13 +4222,17 @@@ "version": "3.1.3", "bundled": true, "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "boom": "2.10.1", + "cryptiles": "2.0.5", + "hoek": "2.16.3", + "sntp": "1.0.9" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "hoek": { "version": "2.16.3", @@@ -2425,12 -3446,21 +4243,29 @@@ "version": "1.1.1", "bundled": true, "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "assert-plus": "0.2.0", + "jsprim": "1.4.0", + "sshpk": "1.13.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "inflight": { "version": "1.0.6", "bundled": true, ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "inherits": { "version": "2.0.3", @@@ -2446,7 -3476,10 +4281,14 @@@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "number-is-nan": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "is-typedarray": { "version": "1.0.0", @@@ -2469,7 -3502,10 +4311,14 @@@ "version": "1.0.2", "bundled": true, "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "jsbn": "0.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "jsbn": { "version": "0.1.1", @@@ -2487,7 -3523,10 +4336,14 @@@ "version": "1.0.1", "bundled": true, "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "jsonify": "0.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "json-stringify-safe": { "version": "5.0.1", @@@ -2506,6 -3545,12 +4362,15 @@@ "bundled": true, "dev": true, "optional": true, ++<<<<<<< HEAD ++======= + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.0.2", + "json-schema": "0.2.3", + "verror": "1.3.6" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "assert-plus": { "version": "1.0.0", @@@ -2523,12 -3568,18 +4388,26 @@@ "mime-types": { "version": "2.1.15", "bundled": true, ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "mime-db": "1.27.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "minimatch": { "version": "3.0.4", "bundled": true, ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "brace-expansion": "1.1.7" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "minimist": { "version": "0.0.8", @@@ -2538,7 -3589,10 +4417,14 @@@ "mkdirp": { "version": "0.5.1", "bundled": true, ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "minimist": "0.0.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "ms": { "version": "2.0.0", @@@ -2550,19 -3604,40 +4436,52 @@@ "version": "0.6.36", "bundled": true, "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "mkdirp": "0.5.1", + "nopt": "4.0.1", + "npmlog": "4.1.0", + "rc": "1.2.1", + "request": "2.81.0", + "rimraf": "2.6.1", + "semver": "5.3.0", + "tar": "2.2.1", + "tar-pack": "3.4.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "nopt": { "version": "4.0.1", "bundled": true, "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "abbrev": "1.1.0", + "osenv": "0.1.4" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "npmlog": { "version": "4.1.0", "bundled": true, "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "are-we-there-yet": "1.1.4", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "number-is-nan": { "version": "1.0.1", @@@ -2584,7 -3659,10 +4503,14 @@@ "once": { "version": "1.4.0", "bundled": true, ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "wrappy": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "os-homedir": { "version": "1.0.2", @@@ -2602,7 -3680,11 +4528,15 @@@ "version": "0.1.4", "bundled": true, "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "path-is-absolute": { "version": "1.0.1", @@@ -2637,6 -3719,12 +4571,15 @@@ "bundled": true, "dev": true, "optional": true, ++<<<<<<< HEAD ++======= + "requires": { + "deep-extend": "0.4.2", + "ini": "1.3.4", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "minimist": { "version": "1.2.0", @@@ -2649,18 -3737,54 +4592,66 @@@ "readable-stream": { "version": "2.2.9", "bundled": true, ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "buffer-shims": "1.0.0", + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "string_decoder": "1.0.1", + "util-deprecate": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "request": { "version": "2.81.0", "bundled": true, "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "aws-sign2": "0.6.0", + "aws4": "1.6.0", + "caseless": "0.12.0", + "combined-stream": "1.0.5", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.1.4", + "har-validator": "4.2.1", + "hawk": "3.1.3", + "http-signature": "1.1.1", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.15", + "oauth-sign": "0.8.2", + "performance-now": "0.2.0", + "qs": "6.4.0", + "safe-buffer": "5.0.1", + "stringstream": "0.0.5", + "tough-cookie": "2.3.2", + "tunnel-agent": "0.6.0", + "uuid": "3.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "rimraf": { "version": "2.6.1", "bundled": true, ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "glob": "7.1.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "safe-buffer": { "version": "5.0.1", @@@ -2689,13 -3813,27 +4680,34 @@@ "version": "1.0.9", "bundled": true, "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "hoek": "2.16.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "sshpk": { "version": "1.13.0", "bundled": true, "dev": true, "optional": true, ++<<<<<<< HEAD ++======= + "requires": { + "asn1": "0.2.3", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.1", + "getpass": "0.1.7", + "jodid25519": "1.0.2", + "jsbn": "0.1.1", + "tweetnacl": "0.14.5" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "assert-plus": { "version": "1.0.0", @@@ -2708,12 -3846,20 +4720,28 @@@ "string_decoder": { "version": "1.0.1", "bundled": true, ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "safe-buffer": "5.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "string-width": { "version": "1.0.2", "bundled": true, ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "stringstream": { "version": "0.0.5", @@@ -2724,7 -3870,10 +4752,14 @@@ "strip-ansi": { "version": "3.0.1", "bundled": true, ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "strip-json-comments": { "version": "2.0.1", @@@ -2735,25 -3884,46 +4770,62 @@@ "tar": { "version": "2.2.1", "bundled": true, ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "block-stream": "0.0.9", + "fstream": "1.0.11", + "inherits": "2.0.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "tar-pack": { "version": "3.4.0", "bundled": true, "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "debug": "2.6.8", + "fstream": "1.0.11", + "fstream-ignore": "1.0.5", + "once": "1.4.0", + "readable-stream": "2.2.9", + "rimraf": "2.6.1", + "tar": "2.2.1", + "uid-number": "0.0.6" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "tough-cookie": { "version": "2.3.2", "bundled": true, "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "punycode": "1.4.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "tunnel-agent": { "version": "0.6.0", "bundled": true, "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "safe-buffer": "5.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "tweetnacl": { "version": "0.14.5", @@@ -2782,13 -3952,19 +4854,27 @@@ "version": "1.3.6", "bundled": true, "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "extsprintf": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "wide-align": { "version": "1.1.2", "bundled": true, "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "string-width": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "wrappy": { "version": "1.0.2", @@@ -2802,6 -3978,12 +4888,15 @@@ "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "graceful-fs": "4.1.11", + "inherits": "2.0.3", + "mkdirp": "0.5.1", + "rimraf": "2.6.2" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "minimist": { "version": "0.0.8", @@@ -2813,7 -3995,10 +4908,14 @@@ "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "minimist": "0.0.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -2827,13 -4012,26 +4929,34 @@@ "version": "2.7.4", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "gaze": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz", "integrity": "sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "globule": "0.1.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "generate-function": { "version": "2.0.0", @@@ -2845,7 -4043,10 +4968,14 @@@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz", "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "is-property": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "get-caller-file": { "version": "1.0.2", @@@ -2870,6 -4071,9 +5000,12 @@@ "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "assert-plus": "1.0.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "assert-plus": { "version": "1.0.0", @@@ -2883,19 -4087,38 +5019,49 @@@ "version": "5.0.15", "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "glob-all": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/glob-all/-/glob-all-3.1.0.tgz", "integrity": "sha1-iRPd+17hrHgSZWJBsD1SF8ZLAqs=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "glob": "7.1.2", + "yargs": "1.2.6" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "glob": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "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" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "minimist": { "version": "0.1.0", @@@ -2907,7 -4130,10 +5073,14 @@@ "version": "1.2.6", "resolved": "https://registry.npmjs.org/yargs/-/yargs-1.2.6.tgz", "integrity": "sha1-nHtKgv1dWVsr8Xq23MQxNUMv40s=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "minimist": "0.1.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -2915,25 -4141,46 +5088,61 @@@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "glob-parent": "2.0.0", + "is-glob": "2.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "glob-parent": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "is-glob": "2.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "glob-stream": { "version": "5.3.5", "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz", "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "extend": "3.0.1", + "glob": "5.0.15", + "glob-parent": "3.1.0", + "micromatch": "2.3.11", + "ordered-read-streams": "0.3.0", + "through2": "0.6.5", + "to-absolute-glob": "0.1.1", + "unique-stream": "2.2.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "glob-parent": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "is-glob": "3.1.0", + "path-dirname": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "is-extglob": { "version": "2.1.1", @@@ -2945,7 -4192,10 +5154,14 @@@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "is-extglob": "2.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "isarray": { "version": "0.0.1", @@@ -2957,7 -4207,13 +5173,17 @@@ "version": "1.0.34", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "string_decoder": { "version": "0.10.31", @@@ -2969,7 -4225,11 +5195,15 @@@ "version": "0.6.5", "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -2977,25 -4237,41 +5211,57 @@@ "version": "0.0.6", "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz", "integrity": "sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "gaze": "0.5.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "glob2base": { "version": "0.0.12", "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz", "integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "find-index": "0.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "global-modules": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz", "integrity": "sha1-6lo77ULG1s6ZWk+KEmm12uIjgo0=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "global-prefix": "0.1.5", + "is-windows": "0.2.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "global-prefix": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz", "integrity": "sha1-jTvGuNo8qBEqFg2NSW/wRiv+948=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "homedir-polyfill": "1.0.1", + "ini": "1.3.4", + "is-windows": "0.2.0", + "which": "1.3.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "globals": { "version": "9.18.0", @@@ -3008,12 -4284,28 +5274,35 @@@ "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "array-union": "1.0.2", + "arrify": "1.0.1", + "glob": "7.1.2", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "glob": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "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" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -3022,12 -4314,22 +5311,29 @@@ "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz", "integrity": "sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "glob": "3.1.21", + "lodash": "1.0.2", + "minimatch": "0.2.14" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "glob": { "version": "3.1.21", "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz", "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "graceful-fs": "1.2.3", + "inherits": "1.0.2", + "minimatch": "0.2.14" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "graceful-fs": { "version": "1.2.3", @@@ -3057,7 -4359,11 +5363,15 @@@ "version": "0.2.14", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lru-cache": "2.7.3", + "sigmund": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -3065,13 -4371,19 +5379,26 @@@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz", "integrity": "sha1-f+DxmfV6yQbPUS/urY+Q7kooT8U=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "sparkles": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "gonzales-pe": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.2.2.tgz", "integrity": "sha512-jbQFnd6CD3iEuGtSKVhsh37tQIkkx+/eil3tufyYOHMouG89uqtkWGP03P4vxY+XGeJnCi3ewIY+BnBogyC61Q==", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "minimist": "1.1.3" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "minimist": { "version": "1.1.3", @@@ -3085,7 -4397,20 +5412,24 @@@ "version": "6.7.1", "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz", "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "create-error-class": "3.0.2", + "duplexer3": "0.1.4", + "get-stream": "3.0.0", + "is-redirect": "1.0.0", + "is-retry-allowed": "1.1.0", + "is-stream": "1.1.0", + "lowercase-keys": "1.0.0", + "safe-buffer": "5.1.1", + "timed-out": "4.0.1", + "unzip-response": "2.0.1", + "url-parse-lax": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "graceful-fs": { "version": "4.1.11", @@@ -3104,6 -4429,21 +5448,24 @@@ "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz", "integrity": "sha1-VxzkWSjdQK9lFPxAEYZgFsE4RbQ=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "archy": "1.0.0", + "chalk": "1.1.3", + "deprecated": "0.0.1", + "gulp-util": "3.0.8", + "interpret": "1.0.4", + "liftoff": "2.3.0", + "minimist": "1.2.0", + "orchestrator": "0.3.8", + "pretty-hrtime": "1.0.3", + "semver": "4.3.6", + "tildify": "1.2.0", + "v8flags": "2.1.1", + "vinyl-fs": "0.3.14" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "clone": { "version": "0.2.0", @@@ -3115,19 -4455,36 +5477,48 @@@ "version": "4.5.3", "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz", "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "2.0.10", + "once": "1.4.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "glob-stream": { "version": "3.1.18", "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz", "integrity": "sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "glob": "4.5.3", + "glob2base": "0.0.12", + "minimatch": "2.0.10", + "ordered-read-streams": "0.1.0", + "through2": "0.6.5", + "unique-stream": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "graceful-fs": { "version": "3.0.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz", "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "natives": "1.1.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "isarray": { "version": "0.0.1", @@@ -3139,7 -4496,10 +5530,14 @@@ "version": "2.0.10", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "brace-expansion": "1.1.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "minimist": { "version": "1.2.0", @@@ -3152,6 -4512,9 +5550,12 @@@ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "minimist": "0.0.8" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "minimist": { "version": "0.0.8", @@@ -3171,7 -4534,13 +5575,17 @@@ "version": "1.0.34", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "semver": { "version": "4.3.6", @@@ -3189,13 -4558,21 +5603,29 @@@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz", "integrity": "sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "first-chunk-stream": "1.0.0", + "is-utf8": "0.2.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "through2": { "version": "0.6.5", "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "unique-stream": { "version": "1.0.0", @@@ -3207,13 -4584,27 +5637,35 @@@ "version": "0.4.6", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "clone": "0.2.0", + "clone-stats": "0.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "vinyl-fs": { "version": "0.3.14", "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz", "integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "defaults": "1.0.3", + "glob-stream": "3.1.18", + "glob-watcher": "0.0.6", + "graceful-fs": "3.0.11", + "mkdirp": "0.5.1", + "strip-bom": "1.0.0", + "through2": "0.6.5", + "vinyl": "0.4.6" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -3222,6 -4613,14 +5674,17 @@@ "resolved": "https://registry.npmjs.org/gulp-autoprefixer/-/gulp-autoprefixer-2.3.1.tgz", "integrity": "sha1-9nXTsb128IjfLySretPkoFngfmc=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "autoprefixer-core": "5.2.1", + "gulp-util": "3.0.8", + "object-assign": "2.1.1", + "postcss": "4.1.16", + "through2": "0.6.5", + "vinyl-sourcemaps-apply": "0.1.4" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "isarray": { "version": "0.0.1", @@@ -3239,7 -4638,13 +5702,17 @@@ "version": "1.0.34", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "string_decoder": { "version": "0.10.31", @@@ -3251,7 -4656,11 +5724,15 @@@ "version": "0.6.5", "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -3259,13 -4668,22 +5740,29 @@@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/gulp-cached/-/gulp-cached-1.1.1.tgz", "integrity": "sha1-/nzU+H83YB5gc8/t7lwr2vi2rM4=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lodash.defaults": "4.2.0", + "through2": "2.0.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "gulp-concat": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz", "integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "concat-with-sourcemaps": "1.0.4", + "through2": "2.0.3", + "vinyl": "2.1.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "clone": { "version": "2.1.1", @@@ -3289,7 -4707,15 +5786,19 @@@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.1.0.tgz", "integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "clone": "2.1.1", + "clone-buffer": "1.0.0", + "clone-stats": "1.0.0", + "cloneable-readable": "1.0.0", + "remove-trailing-separator": "1.1.0", + "replace-ext": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -3298,12 -4724,21 +5807,28 @@@ "resolved": "https://registry.npmjs.org/gulp-cssnano/-/gulp-cssnano-2.1.2.tgz", "integrity": "sha1-4IoJdx7FRUpUnxoAW90lbLjl4KM=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "cssnano": "3.10.0", + "gulp-util": "3.0.8", + "object-assign": "4.1.1", + "vinyl-sourcemaps-apply": "0.2.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "vinyl-sourcemaps-apply": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz", "integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "source-map": "0.5.7" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -3311,25 -4746,47 +5836,62 @@@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/gulp-htmlmin/-/gulp-htmlmin-1.3.0.tgz", "integrity": "sha1-tH/ij+7UCKjsYwRdN6nHjFhr4gI=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "bufferstreams": "1.1.1", + "gulp-util": "3.0.8", + "html-minifier": "1.5.0", + "object-assign": "4.1.1", + "readable-stream": "2.3.3", + "tryit": "1.0.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "gulp-if": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/gulp-if/-/gulp-if-2.0.2.tgz", "integrity": "sha1-pJe351cwBQQcqivIt92jyARE1ik=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "gulp-match": "1.0.3", + "ternary-stream": "2.0.1", + "through2": "2.0.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "gulp-inject-string": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/gulp-inject-string/-/gulp-inject-string-1.1.0.tgz", "integrity": "sha1-8C3e2w91GN+61Uj30t8FuuLtH2Q=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "event-stream": "3.3.4", + "gulp-util": "3.0.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "gulp-inline-css": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/gulp-inline-css/-/gulp-inline-css-2.0.0.tgz", "integrity": "sha1-j8X68BQDaJKu9upmLFd6OtfTESs=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "gulp-util": "3.0.8", + "inline-css": "1.0.5", + "through2": "0.6.5" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "isarray": { "version": "0.0.1", @@@ -3341,7 -4798,13 +5903,17 @@@ "version": "1.0.34", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "string_decoder": { "version": "0.10.31", @@@ -3353,7 -4816,11 +5925,15 @@@ "version": "0.6.5", "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -3361,31 -4828,61 +5941,80 @@@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/gulp-load-plugins/-/gulp-load-plugins-1.5.0.tgz", "integrity": "sha1-TEGffldk2aDjMGG6uWGPgbc9QXE=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "array-unique": "0.2.1", + "fancy-log": "1.3.0", + "findup-sync": "0.4.3", + "gulplog": "1.0.0", + "has-gulplog": "0.1.0", + "micromatch": "2.3.11", + "resolve": "1.4.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "gulp-match": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/gulp-match/-/gulp-match-1.0.3.tgz", "integrity": "sha1-kcfA1/Kb7NZgbVfYCn+Hdqh6uo4=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "minimatch": "3.0.4" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "gulp-prettify": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/gulp-prettify/-/gulp-prettify-0.4.0.tgz", "integrity": "sha1-TefoaZPRiHv2Wicm34dEPL7/vSc=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "extend-shallow": "2.0.1", + "js-beautify": "1.7.3", + "through2": "2.0.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "gulp-prompt": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/gulp-prompt/-/gulp-prompt-0.1.2.tgz", "integrity": "sha1-BsmZvedk4++sYCJTbMK7Aiq4N1A=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "event-stream": "3.0.20", + "inquirer": "0.3.5" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "event-stream": { "version": "3.0.20", "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz", "integrity": "sha1-A4u7LqnqkDhbJvvBhU0LU58qvqM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "duplexer": "0.1.1", + "from": "0.1.7", + "map-stream": "0.0.7", + "pause-stream": "0.0.11", + "split": "0.2.10", + "stream-combiner": "0.0.4", + "through": "2.3.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "map-stream": { "version": "0.0.7", @@@ -3397,7 -4894,10 +6026,14 @@@ "version": "0.2.10", "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz", "integrity": "sha1-Zwl8YB1pfOE2j0GPBs0gHPBSGlc=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "through": "2.3.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -3412,6 -4912,13 +6048,16 @@@ "resolved": "https://registry.npmjs.org/gulp-rsync/-/gulp-rsync-0.0.5.tgz", "integrity": "sha1-PTQGVUFV2kyTfg8/7Bm+BPNVgUg=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "better-assert": "1.0.2", + "gulp-util": "3.0.8", + "lodash.every": "2.4.1", + "lodash.isstring": "2.4.1", + "through2": "0.6.5" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "isarray": { "version": "0.0.1", @@@ -3429,7 -4936,13 +6075,17 @@@ "version": "1.0.34", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "string_decoder": { "version": "0.10.31", @@@ -3441,7 -4954,11 +6097,15 @@@ "version": "0.6.5", "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -3450,12 -4967,22 +6114,29 @@@ "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-2.3.2.tgz", "integrity": "sha1-grerkP6QLNw0wE8YDZLyw0kC3VI=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "gulp-util": "3.0.8", + "lodash.clonedeep": "4.5.0", + "node-sass": "3.13.1", + "through2": "2.0.3", + "vinyl-sourcemaps-apply": "0.2.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "vinyl-sourcemaps-apply": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz", "integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "source-map": "0.5.7" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -3463,13 -4990,31 +6144,38 @@@ "version": "1.3.3", "resolved": "https://registry.npmjs.org/gulp-sass-lint/-/gulp-sass-lint-1.3.3.tgz", "integrity": "sha1-+HnUI+UXoocqiQJGbA3sgUbceHQ=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "gulp-util": "3.0.8", + "sass-lint": "1.11.1", + "through2": "2.0.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "gulp-sourcemaps": { "version": "1.12.0", "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.12.0.tgz", "integrity": "sha1-eG+XyUoPloSSRl1wVY4EJCxnlZg=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "@gulp-sourcemaps/map-sources": "1.0.0", + "acorn": "4.0.13", + "convert-source-map": "1.5.0", + "css": "2.2.1", + "debug-fabulous": "0.0.4", + "detect-newline": "2.1.0", + "graceful-fs": "4.1.11", + "source-map": "0.5.7", + "strip-bom": "2.0.0", + "through2": "2.0.3", + "vinyl": "1.2.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "acorn": { "version": "4.0.13", @@@ -3484,6 -5029,26 +6190,29 @@@ "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "array-differ": "1.0.0", + "array-uniq": "1.0.3", + "beeper": "1.1.1", + "chalk": "1.1.3", + "dateformat": "2.0.0", + "fancy-log": "1.3.0", + "gulplog": "1.0.0", + "has-gulplog": "0.1.0", + "lodash._reescape": "3.0.0", + "lodash._reevaluate": "3.0.0", + "lodash._reinterpolate": "3.0.0", + "lodash.template": "3.6.2", + "minimist": "1.2.0", + "multipipe": "0.1.2", + "object-assign": "3.0.0", + "replace-ext": "0.0.1", + "through2": "2.0.3", + "vinyl": "0.5.3" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "minimist": { "version": "1.2.0", @@@ -3501,7 -5066,12 +6230,16 @@@ "version": "0.5.3", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "clone": "1.0.2", + "clone-stats": "0.0.1", + "replace-ext": "0.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -3510,6 -5080,18 +6248,21 @@@ "resolved": "https://registry.npmjs.org/gulp-wrap/-/gulp-wrap-0.11.0.tgz", "integrity": "sha1-a0nz9r8cmWT8Twxgwu5Gd61JtcE=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "consolidate": "0.11.0", + "es6-promise": "2.3.0", + "fs-readfile-promise": "1.1.0", + "gulp-util": "3.0.8", + "js-yaml": "3.7.0", + "lodash": "3.10.1", + "node.extend": "1.1.6", + "through2": "0.6.5", + "tryit": "1.0.3", + "vinyl-bufferstream": "1.0.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "isarray": { "version": "0.0.1", @@@ -3521,7 -5103,13 +6274,17 @@@ "version": "1.0.34", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "string_decoder": { "version": "0.10.31", @@@ -3533,7 -5121,11 +6296,15 @@@ "version": "0.6.5", "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -3541,25 -5133,43 +6312,58 @@@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/gulp-zip/-/gulp-zip-3.2.0.tgz", "integrity": "sha1-69GY2ubcLV9E2BRWnI7EIRipPvk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "concat-stream": "1.5.2", + "gulp-util": "3.0.8", + "through2": "2.0.3", + "yazl": "2.4.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "gulplog": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "glogg": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "handlebars": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-3.0.3.tgz", "integrity": "sha1-DgllGi8Ps8lJFgWDcQ1VH5Lm0q0=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "optimist": "0.6.1", + "source-map": "0.1.43", + "uglify-js": "2.3.6" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "source-map": { "version": "0.1.43", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "amdefine": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -3573,25 -5183,38 +6377,53 @@@ "version": "4.2.1", "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "ajv": "4.11.8", + "har-schema": "1.0.5" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "has": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz", "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "function-bind": "1.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "has-ansi": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "has-binary": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz", "integrity": "sha1-aOYesWIQyVRaClzOBqhzkS/h5ow=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "isarray": "0.0.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "isarray": { "version": "0.0.1", @@@ -3617,7 -5240,10 +6449,14 @@@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz", "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "sparkles": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "has-unicode": { "version": "2.0.1", @@@ -3629,7 -5255,13 +6468,17 @@@ "version": "3.1.3", "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "boom": "2.10.1", + "cryptiles": "2.0.5", + "hoek": "2.16.3", + "sntp": "1.0.9" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "he": { "version": "1.0.0", @@@ -3653,9 -5285,12 +6502,17 @@@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz", "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=", ++<<<<<<< HEAD + "dev": true + }, - "hosted-git-info": { ++======= + "dev": true, + "requires": { + "parse-passwd": "1.0.0" + } + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 + "hosted-git-info": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==", @@@ -3665,7 -5300,10 +6522,14 @@@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/href-content/-/href-content-1.0.2.tgz", "integrity": "sha1-jUYiij1VziQwPd+5M0DQ77fd21g=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "remote-content": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "html-comment-regex": { "version": "1.1.1", @@@ -3678,6 -5316,16 +6542,19 @@@ "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-1.5.0.tgz", "integrity": "sha1-vrBf2cw0CUWGXBD0Cu30aa9LFTQ=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "change-case": "2.3.1", + "clean-css": "3.4.28", + "commander": "2.9.0", + "concat-stream": "1.5.2", + "he": "1.0.0", + "ncname": "1.0.0", + "relateurl": "0.2.7", + "uglify-js": "2.6.4" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "async": { "version": "0.2.10", @@@ -3689,19 -5337,33 +6566,45 @@@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "center-align": "0.1.3", + "right-align": "0.1.3", + "wordwrap": "0.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "commander": { "version": "2.9.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "graceful-readlink": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "uglify-js": { "version": "2.6.4", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.4.tgz", "integrity": "sha1-ZeovswWck5RpLxX+2HwrNsFrmt8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "async": "0.2.10", + "source-map": "0.5.7", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "window-size": { "version": "0.1.0", @@@ -3719,7 -5381,13 +6622,17 @@@ "version": "3.10.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", + "window-size": "0.1.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -3728,12 -5396,23 +6641,30 @@@ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz", "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "domelementtype": "1.3.0", + "domhandler": "2.3.0", + "domutils": "1.5.1", + "entities": "1.0.0", + "readable-stream": "1.1.14" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "domutils": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "dom-serializer": "0.1.0", + "domelementtype": "1.3.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "entities": { "version": "1.0.0", @@@ -3751,7 -5430,13 +6682,17 @@@ "version": "1.1.14", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "string_decoder": { "version": "0.10.31", @@@ -3765,19 -5450,33 +6706,45 @@@ "version": "1.5.1", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz", "integrity": "sha1-eIwNLB3iyBuebowBhDtrl+uSB1A=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "inherits": "2.0.3", + "setprototypeof": "1.0.2", + "statuses": "1.3.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "http-proxy": { "version": "1.15.2", "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.15.2.tgz", "integrity": "sha1-ZC/cr/5S00SNK9o7AHnpQJBk2jE=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "eventemitter3": "1.2.0", + "requires-port": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "http-signature": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "assert-plus": "0.2.0", + "jsprim": "1.4.1", + "sshpk": "1.13.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "ignore": { "version": "3.3.5", @@@ -3813,7 -5512,10 +6780,14 @@@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "repeating": "2.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "indexes-of": { "version": "1.0.1", @@@ -3831,7 -5533,11 +6805,15 @@@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "inherits": { "version": "2.0.3", @@@ -3848,18 -5554,40 +6830,51 @@@ "inky": { "version": "github:zurb/inky#f085b50b52f7b27b8bf70afec06eb615d3f2c18c", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "cheerio": "0.20.0", + "foundation-emails": "2.2.1", + "mkdirp": "0.5.1", + "object-values": "1.0.0", + "through2": "2.0.3", + "vinyl-fs": "2.4.4" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "cheerio": { "version": "0.20.0", "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.20.0.tgz", "integrity": "sha1-XHEPK6uVZTJyhCugHG6mGzVF7DU=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "css-select": "1.2.0", + "dom-serializer": "0.1.0", + "entities": "1.1.1", + "htmlparser2": "3.8.3", + "jsdom": "7.2.2", + "lodash": "4.17.4" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "css-select": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "boolbase": "1.0.0", + "css-what": "2.1.0", + "domutils": "1.5.1", + "nth-check": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "css-what": { "version": "2.1.0", @@@ -3871,7 -5599,11 +6886,15 @@@ "version": "1.5.1", "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "dom-serializer": "0.1.0", + "domelementtype": "1.3.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lodash": { "version": "4.17.4", @@@ -3889,7 -5621,10 +6912,14 @@@ "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "minimist": "0.0.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -3897,13 -5632,26 +6927,33 @@@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/inline-css/-/inline-css-1.0.5.tgz", "integrity": "sha1-CQoX68th/sB2Ye3nBrcdTrGsmcg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "cheerio": "0.19.0", + "css-property": "1.0.2", + "css-rules": "1.0.2", + "extract-css": "1.0.3", + "style-selector": "1.0.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "inquirer": { "version": "0.3.5", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.3.5.tgz", "integrity": "sha1-p4vgZKyavxaBR8Ahaakx2aSDqfY=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "async": "0.2.10", + "cli-color": "0.2.3", + "lodash": "1.2.1", + "mute-stream": "0.0.3" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "async": { "version": "0.2.10", @@@ -3941,7 -5689,11 +6991,15 @@@ "version": "0.2.6", "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz", "integrity": "sha1-IN5p89uULvLYe5wto28XIjWxtes=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "is-relative": "0.2.1", + "is-windows": "0.2.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "is-absolute-url": { "version": "2.1.0", @@@ -3959,7 -5711,10 +7017,14 @@@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "binary-extensions": "1.10.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "is-buffer": { "version": "1.1.5", @@@ -3971,7 -5726,10 +7036,14 @@@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "builtin-modules": "1.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "is-dotfile": { "version": "1.0.3", @@@ -3983,7 -5741,10 +7055,14 @@@ "version": "0.1.3", "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "is-primitive": "2.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "is-extendable": { "version": "0.1.1", @@@ -4001,31 -5762,49 +7080,69 @@@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "number-is-nan": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "is-fullwidth-code-point": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "number-is-nan": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "is-glob": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "is-lower-case": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/is-lower-case/-/is-lower-case-1.1.3.tgz", "integrity": "sha1-fhR75HaNxGbbO/shzGCzHmrWk5M=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lower-case": "1.1.4" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "is-my-json-valid": { "version": "2.16.1", "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz", "integrity": "sha512-ochPsqWS1WXj8ZnMIV0vnNXooaMhp7cyL4FMSIPKTtnV0Ha/T19G2b9kkhcNsabV9bxYkze7/aLZJb/bYuFduQ==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "generate-function": "2.0.0", + "generate-object-property": "1.2.0", + "jsonpointer": "4.0.1", + "xtend": "4.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "is-npm": { "version": "1.0.0", @@@ -4037,13 -5816,19 +7154,27 @@@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "kind-of": "3.2.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "is-number-like": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/is-number-like/-/is-number-like-1.0.8.tgz", "integrity": "sha512-6rZi3ezCyFcn5L71ywzz2bS5b2Igl1En3eTlZlvKjpz1n3IZLAYMbKYAIQgFmEu0GENg92ziU/faEOA/aixjbA==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lodash.isfinite": "3.3.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "is-obj": { "version": "1.0.1", @@@ -4061,13 -5846,19 +7192,27 @@@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz", "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "is-path-inside": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "is-path-inside": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz", "integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "path-is-inside": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "is-plain-obj": { "version": "1.1.0", @@@ -4080,6 -5871,9 +7225,12 @@@ "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "isobject": "3.0.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "isobject": { "version": "3.0.1", @@@ -4117,13 -5911,19 +7268,27 @@@ "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz", "integrity": "sha1-0n9MfVFtF1+2ENuEu+7yPDvJeqU=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "is-unc-path": "0.1.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "is-resolvable": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz", "integrity": "sha1-jfV8YeouPFAUCNEA+wE8+NbgzGI=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "tryit": "1.0.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "is-retry-allowed": { "version": "1.1.0", @@@ -4141,7 -5941,10 +7306,14 @@@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz", "integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "html-comment-regex": "1.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "is-typedarray": { "version": "1.0.0", @@@ -4153,13 -5956,19 +7325,27 @@@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz", "integrity": "sha1-arBTpyVzwQJQ/0FqOBTDUXivObk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "unc-path-regex": "0.1.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "is-upper-case": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/is-upper-case/-/is-upper-case-1.1.2.tgz", "integrity": "sha1-jQsfp+eTOh5YSDYA7H2WYcuvdW8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "upper-case": "1.1.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "is-utf8": { "version": "0.2.1", @@@ -4195,7 -6004,10 +7381,14 @@@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "isarray": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "isstream": { "version": "0.1.2", @@@ -4220,6 -6032,12 +7413,15 @@@ "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.7.3.tgz", "integrity": "sha512-mT9skIu0OWfBQPXOGJ4CgpPBgo3tj9gxi7weQdeaxxmpKIADK2g0xS0qCtQml7Ny3Ick5Cno093LKGZTzDd2UQ==", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "config-chain": "1.1.11", + "editorconfig": "0.13.3", + "mkdirp": "0.5.1", + "nopt": "3.0.6" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "minimist": { "version": "0.0.8", @@@ -4231,7 -6049,10 +7433,14 @@@ "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "minimist": "0.0.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -4240,6 -6061,10 +7449,13 @@@ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz", "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "argparse": "1.0.9", + "esprima": "2.7.3" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "esprima": { "version": "2.7.3", @@@ -4267,6 -6092,20 +7483,23 @@@ "resolved": "https://registry.npmjs.org/jsdoc-75lb/-/jsdoc-75lb-3.6.0.tgz", "integrity": "sha1-qAcRlSi0AJzLyrSbdSL2P+xs0L0=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "bluebird": "3.4.7", + "catharsis": "0.8.9", + "escape-string-regexp": "1.0.5", + "espree": "3.1.7", + "js2xmlparser": "1.0.0", + "klaw": "1.3.1", + "marked": "0.3.6", + "mkdirp": "0.5.1", + "requizzle": "0.2.1", + "strip-json-comments": "2.0.1", + "taffydb": "2.6.2", + "underscore": "1.8.3" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "acorn": { "version": "3.3.0", @@@ -4284,7 -6123,11 +7517,15 @@@ "version": "3.1.7", "resolved": "https://registry.npmjs.org/espree/-/espree-3.1.7.tgz", "integrity": "sha1-/V3ux2qXpRIKnNOnyxF3oJI7EdI=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "acorn": "3.3.0", + "acorn-jsx": "3.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "minimist": { "version": "0.0.8", @@@ -4296,7 -6139,10 +7537,14 @@@ "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "minimist": "0.0.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "strip-json-comments": { "version": "2.0.1", @@@ -4316,31 -6162,68 +7564,87 @@@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/jsdoc-api/-/jsdoc-api-1.2.4.tgz", "integrity": "sha1-UBIjWSe/rR4nvIjQew3d2y06ilk=", - "dev": true ++<<<<<<< HEAD ++ "dev": true ++======= + "dev": true, + "requires": { + "array-back": "1.0.4", + "cache-point": "0.3.4", + "collect-all": "1.0.3", + "core-js": "2.5.1", + "feature-detect-es6": "1.3.1", + "file-set": "1.1.1", + "jsdoc-75lb": "3.6.0", + "object-to-spawn-args": "1.1.1", + "promise.prototype.finally": "1.0.1", + "temp-path": "1.0.0", + "then-fs": "2.0.0", + "walk-back": "2.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "jsdoc3-parser": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/jsdoc3-parser/-/jsdoc3-parser-1.1.0.tgz", "integrity": "sha1-L1wWGUQSFSQlJXungf2d/eAka8w=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "jsdoc": "3.5.5" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "js2xmlparser": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz", "integrity": "sha1-P7YOqgicVED5MZ9RdgzNB+JJlzM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "xmlcreate": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "jsdoc": { "version": "3.5.5", "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.5.5.tgz", "integrity": "sha512-6PxB65TAU4WO0Wzyr/4/YhlGovXl0EVYfpKbpSroSj0qBxT4/xod/l40Opkm38dRHRdQgdeY836M0uVnJQG7kg==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "babylon": "7.0.0-beta.19", + "bluebird": "3.5.0", + "catharsis": "0.8.9", + "escape-string-regexp": "1.0.5", + "js2xmlparser": "3.0.0", + "klaw": "2.0.0", + "marked": "0.3.6", + "mkdirp": "0.5.1", + "requizzle": "0.2.1", + "strip-json-comments": "2.0.1", + "taffydb": "2.6.2", + "underscore": "1.8.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "klaw": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/klaw/-/klaw-2.0.0.tgz", "integrity": "sha1-WcEo4Nxc5BAgEVEZTuucv4WGUPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "graceful-fs": "4.1.11" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "minimist": { "version": "0.0.8", @@@ -4352,7 -6235,10 +7656,14 @@@ "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "minimist": "0.0.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "strip-json-comments": { "version": "2.0.1", @@@ -4373,7 -6259,24 +7684,28 @@@ "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-7.2.2.tgz", "integrity": "sha1-QLQCdwwr2iNGkJa+6Rq2deOx/G4=", "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "abab": "1.0.3", + "acorn": "2.7.0", + "acorn-globals": "1.0.9", + "cssom": "0.3.2", + "cssstyle": "0.2.37", + "escodegen": "1.9.0", + "nwmatcher": "1.4.1", + "parse5": "1.5.1", + "request": "2.81.0", + "sax": "1.2.4", + "symbol-tree": "3.2.2", + "tough-cookie": "2.3.2", + "webidl-conversions": "2.0.1", + "whatwg-url-compat": "0.6.5", + "xml-name-validator": "2.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "json-schema": { "version": "0.2.3", @@@ -4385,7 -6288,10 +7717,14 @@@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "jsonify": "0.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "json-stringify-safe": { "version": "5.0.1", @@@ -4403,7 -6309,10 +7742,14 @@@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz", "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "graceful-fs": "4.1.11" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "jsonify": { "version": "0.0.0", @@@ -4422,6 -6331,12 +7768,15 @@@ "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "assert-plus": { "version": "1.0.0", @@@ -4441,13 -6356,19 +7796,27 @@@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "is-buffer": "1.1.5" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "klaw": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "graceful-fs": "4.1.11" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "known-css-properties": { "version": "0.3.0", @@@ -4459,7 -6380,10 +7828,14 @@@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz", "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "package-json": "4.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lazy-cache": { "version": "1.0.4", @@@ -4477,31 -6401,55 +7853,75 @@@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/lazypipe/-/lazypipe-1.0.1.tgz", "integrity": "sha1-FHGu9rN6NA1Rw030Rpnc7wZMGUA=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "stream-combiner": "0.0.4" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lazystream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz", "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "readable-stream": "2.3.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lcid": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "invert-kv": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "levn": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "prelude-ls": "1.1.2", + "type-check": "0.3.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "liftoff": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.3.0.tgz", "integrity": "sha1-qY8v9nGD2Lp8+soQVIvX/wVQs4U=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "extend": "3.0.1", + "findup-sync": "0.4.3", + "fined": "1.1.0", + "flagged-respawn": "0.3.2", + "lodash.isplainobject": "4.0.6", + "lodash.isstring": "4.0.1", + "lodash.mapvalues": "4.6.0", + "rechoir": "0.6.2", + "resolve": "1.4.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "limiter": { "version": "1.1.2", @@@ -4513,25 -6461,46 +7933,61 @@@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/list-stylesheets/-/list-stylesheets-1.1.0.tgz", "integrity": "sha1-8N/w+xh6ov7KmZgEWZQUHMKdvzE=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "cheerio": "0.19.0", + "extend": "3.0.1", + "object.pick": "1.3.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "load-json-file": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "localtunnel": { "version": "1.8.3", "resolved": "https://registry.npmjs.org/localtunnel/-/localtunnel-1.8.3.tgz", "integrity": "sha1-3MWSL9hWUQN9S94k/ZMkjQsk6wU=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "debug": "2.6.8", + "openurl": "1.1.1", + "request": "2.81.0", + "yargs": "3.29.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "debug": { "version": "2.6.8", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "ms": "2.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "ms": { "version": "2.0.0", @@@ -4543,7 -6512,15 +7999,19 @@@ "version": "3.29.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.29.0.tgz", "integrity": "sha1-GquWYOrnnYuPZ1vK7qtu40ws9pw=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "camelcase": "1.2.1", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "os-locale": "1.4.0", + "window-size": "0.1.4", + "y18n": "3.2.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -4563,7 -6540,13 +8031,17 @@@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/lodash._basebind/-/lodash._basebind-2.4.1.tgz", "integrity": "sha1-6UC5690nwyfgqNqxtVkWxTQelXU=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lodash._basecreate": "2.4.1", + "lodash._setbinddata": "2.4.1", + "lodash._slice": "2.4.1", + "lodash.isobject": "2.4.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lodash._basecopy": { "version": "3.0.1", @@@ -4575,25 -6558,49 +8053,65 @@@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-2.4.1.tgz", "integrity": "sha1-+Ob1tXip405UEXm1a47uv0oofgg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lodash._isnative": "2.4.1", + "lodash.isobject": "2.4.1", + "lodash.noop": "2.4.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lodash._basecreatecallback": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/lodash._basecreatecallback/-/lodash._basecreatecallback-2.4.1.tgz", "integrity": "sha1-fQsmdknLKeehOdAQO3wR+uhOSFE=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lodash._setbinddata": "2.4.1", + "lodash.bind": "2.4.1", + "lodash.identity": "2.4.1", + "lodash.support": "2.4.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lodash._basecreatewrapper": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/lodash._basecreatewrapper/-/lodash._basecreatewrapper-2.4.1.tgz", "integrity": "sha1-TTHy595+E0+/KAN2K4FQsyUZZm8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lodash._basecreate": "2.4.1", + "lodash._setbinddata": "2.4.1", + "lodash._slice": "2.4.1", + "lodash.isobject": "2.4.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lodash._baseisequal": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/lodash._baseisequal/-/lodash._baseisequal-2.4.1.tgz", "integrity": "sha1-ax5i5YfFUjER9vIoVT2rGeRF/AM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lodash._getarray": "2.4.1", + "lodash._objecttypes": "2.4.1", + "lodash._releasearray": "2.4.1", + "lodash.forin": "2.4.1", + "lodash.isfunction": "2.4.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lodash._basetostring": { "version": "3.0.1", @@@ -4611,13 -6618,22 +8129,30 @@@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/lodash._createwrapper/-/lodash._createwrapper-2.4.1.tgz", "integrity": "sha1-UdaVeXPaTtVW43KQ2MGhjFPeFgc=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lodash._basebind": "2.4.1", + "lodash._basecreatewrapper": "2.4.1", + "lodash._slice": "2.4.1", + "lodash.isfunction": "2.4.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lodash._getarray": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/lodash._getarray/-/lodash._getarray-2.4.1.tgz", "integrity": "sha1-+vH3+BD6mFolHCGHQESBCUg55e4=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lodash._arraypool": "2.4.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lodash._getnative": { "version": "3.9.1", @@@ -4671,7 -6687,11 +8206,15 @@@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/lodash._releasearray/-/lodash._releasearray-2.4.1.tgz", "integrity": "sha1-phOWMNdtFTawfdyAliiJsIL2pkE=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lodash._arraypool": "2.4.1", + "lodash._maxpoolsize": "2.4.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lodash._root": { "version": "3.0.1", @@@ -4683,13 -6703,20 +8226,28 @@@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/lodash._setbinddata/-/lodash._setbinddata-2.4.1.tgz", "integrity": "sha1-98IAzRuS7yNrOZ7s9zxkjReqlNI=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lodash._isnative": "2.4.1", + "lodash.noop": "2.4.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lodash._shimkeys": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz", "integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lodash._objecttypes": "2.4.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lodash._slice": { "version": "2.4.1", @@@ -4707,7 -6734,11 +8265,15 @@@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-2.4.1.tgz", "integrity": "sha1-XRn6AFyMTSNvr0dCx7eh/Kvikmc=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lodash._createwrapper": "2.4.1", + "lodash._slice": "2.4.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lodash.capitalize": { "version": "4.2.1", @@@ -4726,12 -6757,24 +8292,31 @@@ "resolved": "https://registry.npmjs.org/lodash.createcallback/-/lodash.createcallback-2.4.4.tgz", "integrity": "sha1-SkUwhJsBZVAD/L31Y1JO/zzrAsQ=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "lodash._basecreatecallback": "2.4.1", + "lodash._baseisequal": "2.4.1", + "lodash.isobject": "2.4.1", + "lodash.keys": "2.4.1", + "lodash.property": "2.4.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "lodash.keys": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lodash._isnative": "2.4.1", + "lodash._shimkeys": "2.4.1", + "lodash.isobject": "2.4.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -4751,31 -6794,52 +8336,71 @@@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lodash._root": "3.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lodash.every": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/lodash.every/-/lodash.every-2.4.1.tgz", "integrity": "sha1-Iozlheb0kMAymAW4/A+s1BW4OwU=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lodash.createcallback": "2.4.4", + "lodash.forown": "2.4.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lodash.forin": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/lodash.forin/-/lodash.forin-2.4.1.tgz", "integrity": "sha1-gInq7X0lsIZyt8Zv0HrFXQYjIOs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lodash._basecreatecallback": "2.4.1", + "lodash._objecttypes": "2.4.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lodash.forown": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/lodash.forown/-/lodash.forown-2.4.1.tgz", "integrity": "sha1-eLQer+FAX6lmRZ6kGT/VAtCEUks=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "lodash._basecreatecallback": "2.4.1", + "lodash._objecttypes": "2.4.1", + "lodash.keys": "2.4.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "lodash.keys": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lodash._isnative": "2.4.1", + "lodash._shimkeys": "2.4.1", + "lodash.isobject": "2.4.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -4819,7 -6883,10 +8444,14 @@@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz", "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lodash._objecttypes": "2.4.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lodash.isplainobject": { "version": "4.0.6", @@@ -4843,7 -6910,12 +8475,16 @@@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lodash._getnative": "3.9.1", + "lodash.isarguments": "3.1.0", + "lodash.isarray": "3.0.4" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lodash.mapvalues": { "version": "4.6.0", @@@ -4879,19 -6951,37 +8520,49 @@@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/lodash.support/-/lodash.support-2.4.1.tgz", "integrity": "sha1-Mg4LZwMWc8KNeiu12eAzGkUkBRU=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lodash._isnative": "2.4.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lodash.template": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lodash._basecopy": "3.0.1", + "lodash._basetostring": "3.0.1", + "lodash._basevalues": "3.0.0", + "lodash._isiterateecall": "3.0.9", + "lodash._reinterpolate": "3.0.0", + "lodash.escape": "3.2.0", + "lodash.keys": "3.1.2", + "lodash.restparam": "3.6.1", + "lodash.templatesettings": "3.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lodash.templatesettings": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz", "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lodash._reinterpolate": "3.0.0", + "lodash.escape": "3.2.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lodash.uniq": { "version": "4.5.0", @@@ -4909,7 -6999,11 +8580,15 @@@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "currently-unhandled": "0.4.1", + "signal-exit": "3.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lower-case": { "version": "1.1.4", @@@ -4921,7 -7015,10 +8600,14 @@@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/lower-case-first/-/lower-case-first-1.0.2.tgz", "integrity": "sha1-5dp8JvKacHO+AtUrrJmA5ZIq36E=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lower-case": "1.1.4" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lowercase-keys": { "version": "1.0.0", @@@ -4933,7 -7030,10 +8619,14 @@@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz", "integrity": "sha1-cXibO39Tmb7IVl3aOKow0qCX7+4=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "pseudomap": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "macaddress": { "version": "0.2.8", @@@ -4945,7 -7045,10 +8638,14 @@@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz", "integrity": "sha1-l6ARdR6R3YfPre9Ygy67BJNt6Xg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "pify": "2.3.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "map-cache": { "version": "0.2.2", @@@ -4970,12 -7073,18 +8670,25 @@@ "resolved": "https://registry.npmjs.org/markdown/-/markdown-0.5.0.tgz", "integrity": "sha1-KCBbVlqK51kt4gdGPWY33BgnIrI=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "nopt": "2.1.2" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "nopt": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz", "integrity": "sha1-bMzZd7gBMqB3MdbozljCyDA8+a8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "abbrev": "1.1.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -4995,7 -7104,10 +8708,14 @@@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/mediaquery-text/-/mediaquery-text-1.0.2.tgz", "integrity": "sha1-PkWYzDp9t+lvUKuccC8fbPYxgNI=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "cssom": "0.3.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "memoize-decorator": { "version": "1.0.2", @@@ -5007,13 -7119,30 +8727,37 @@@ "version": "0.2.6", "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.2.6.tgz", "integrity": "sha1-u0WnrQJTAILxYSZx2rNSGc0uB0E=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "es5-ext": "0.9.2", + "event-emitter": "0.2.2", + "next-tick": "0.1.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "meow": { "version": "3.7.0", "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "camelcase-keys": "2.1.0", + "decamelize": "1.2.0", + "loud-rejection": "1.6.0", + "map-obj": "1.0.1", + "minimist": "1.2.0", + "normalize-package-data": "2.4.0", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "redent": "1.0.0", + "trim-newlines": "1.0.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "minimist": { "version": "1.2.0", @@@ -5033,7 -7162,10 +8777,14 @@@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "readable-stream": "2.3.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "methods": { "version": "1.1.2", @@@ -5045,7 -7177,22 +8796,26 @@@ "version": "2.3.11", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", - "dev": true ++<<<<<<< HEAD ++ "dev": true ++======= + "dev": true, + "requires": { + "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" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "mime": { "version": "1.2.4", @@@ -5063,13 -7210,19 +8833,27 @@@ "version": "2.1.17", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz", "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "mime-db": "1.30.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "brace-expansion": "1.1.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "minimist": { "version": "0.0.10", @@@ -5087,7 -7240,10 +8871,14 @@@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/motion-ui/-/motion-ui-1.2.3.tgz", "integrity": "sha1-n34X8NZqFenuVJAj5vPeETmi4WY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "jquery": "3.2.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "ms": { "version": "0.7.1", @@@ -5099,13 -7255,19 +8890,27 @@@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/multiline/-/multiline-1.0.2.tgz", "integrity": "sha1-abHyX/B00oKJBPJE3dBrfZbvbJM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "strip-indent": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "multipipe": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "duplexer2": "0.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "mute-stream": { "version": "0.0.3", @@@ -5129,7 -7291,10 +8934,14 @@@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/ncname/-/ncname-1.0.0.tgz", "integrity": "sha1-W1etGLHKCShk72Kwse2BlPODtxw=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "xml-char-classes": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "negotiator": { "version": "0.6.1", @@@ -5147,19 -7312,45 +8959,56 @@@ "version": "2.3.2", "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lower-case": "1.1.4" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "node-gyp": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz", "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "fstream": "1.0.11", + "glob": "7.1.2", + "graceful-fs": "4.1.11", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "nopt": "3.0.6", + "npmlog": "4.1.2", + "osenv": "0.1.4", + "request": "2.81.0", + "rimraf": "2.6.2", + "semver": "5.3.0", + "tar": "2.2.1", + "which": "1.3.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "glob": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "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" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "minimist": { "version": "0.0.8", @@@ -5171,7 -7362,10 +9020,14 @@@ "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "minimist": "0.0.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "semver": { "version": "5.3.0", @@@ -5186,24 -7380,58 +9042,73 @@@ "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-3.13.1.tgz", "integrity": "sha1-ckD7v/I5YwS0IjUn7TAgWJwAT8I=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "async-foreach": "0.1.3", + "chalk": "1.1.3", + "cross-spawn": "3.0.1", + "gaze": "1.1.2", + "get-stdin": "4.0.1", + "glob": "7.1.2", + "in-publish": "2.0.0", + "lodash.assign": "4.2.0", + "lodash.clonedeep": "4.5.0", + "meow": "3.7.0", + "mkdirp": "0.5.1", + "nan": "2.7.0", + "node-gyp": "3.6.2", + "npmlog": "4.1.2", + "request": "2.81.0", + "sass-graph": "2.2.4" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "gaze": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz", "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "globule": "1.2.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "glob": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "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" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "globule": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz", "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "glob": "7.1.2", + "lodash": "4.17.4", + "minimatch": "3.0.4" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lodash": { "version": "4.17.4", @@@ -5221,7 -7449,10 +9126,14 @@@ "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "minimist": "0.0.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -5229,25 -7460,40 +9141,56 @@@ "version": "1.1.6", "resolved": "https://registry.npmjs.org/node.extend/-/node.extend-1.1.6.tgz", "integrity": "sha1-p7iCyC1sk6SGOlUEvV3o7IYli5Y=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "is": "3.2.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "nopt": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "abbrev": "1.1.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "normalize-package-data": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "hosted-git-info": "2.5.0", + "is-builtin-module": "1.0.0", + "semver": "5.4.1", + "validate-npm-package-license": "3.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "normalize-path": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "remove-trailing-separator": "1.1.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "normalize-range": { "version": "0.1.2", @@@ -5259,25 -7505,43 +9202,59 @@@ "version": "1.9.1", "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz", "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "object-assign": "4.1.1", + "prepend-http": "1.0.4", + "query-string": "4.3.4", + "sort-keys": "1.1.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "path-key": "2.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "npmlog": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "are-we-there-yet": "1.1.4", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "nth-check": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz", "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "boolbase": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "num2fraction": { "version": "1.2.2", @@@ -5339,12 -7603,21 +9316,28 @@@ "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz", "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "array-each": "1.0.1", + "array-slice": "1.0.0", + "for-own": "1.0.0", + "isobject": "3.0.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "for-own": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "for-in": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "isobject": { "version": "3.0.1", @@@ -5358,13 -7631,20 +9351,27 @@@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "for-own": "0.1.5", + "is-extendable": "0.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "object.pick": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "isobject": "3.0.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "isobject": { "version": "3.0.1", @@@ -5378,19 -7658,32 +9385,44 @@@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/octophant/-/octophant-1.0.1.tgz", "integrity": "sha1-5LpJs6RzuscPaHHR+xTnSHllpLA=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "array-move": "1.0.0", + "capitalize": "1.0.0", + "multiline": "1.0.2", + "repeat-string": "1.6.1", + "sassdoc": "2.3.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "ee-first": "1.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "wrappy": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "onetime": { "version": "1.1.0", @@@ -5408,13 -7701,21 +9440,28 @@@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz", "integrity": "sha1-erwi5kTf9jsKltWrfyeQwPAavJU=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "object-assign": "4.1.1", + "pinkie-promise": "2.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "optimist": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "minimist": "0.0.10", + "wordwrap": "0.0.3" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "wordwrap": { "version": "0.0.3", @@@ -5428,7 -7729,15 +9475,19 @@@ "version": "0.8.2", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "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" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "options": { "version": "0.0.6", @@@ -5441,18 -7750,29 +9500,40 @@@ "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz", "integrity": "sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "end-of-stream": "0.1.5", + "sequencify": "0.0.7", + "stream-consume": "0.1.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "end-of-stream": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz", "integrity": "sha1-jhdyBsPICDfYVjLouTWd/osvbq8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "once": "1.3.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "once": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "wrappy": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -5460,7 -7780,11 +9541,15 @@@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz", "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "is-stream": "1.1.0", + "readable-stream": "2.3.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "os-homedir": { "version": "1.0.2", @@@ -5472,7 -7796,10 +9561,14 @@@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lcid": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "os-tmpdir": { "version": "1.0.2", @@@ -5484,7 -7811,11 +9580,15 @@@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz", "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "p-finally": { "version": "1.0.0", @@@ -5496,32 -7827,71 +9600,90 @@@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz", "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "got": "6.7.1", + "registry-auth-token": "3.3.1", + "registry-url": "3.1.0", + "semver": "5.4.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "panini": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/panini/-/panini-1.5.1.tgz", "integrity": "sha1-q63gQQcftxxrP9eF99Jgvhd8fTA=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "deepmerge": "1.5.1", + "front-matter": "2.1.2", + "glob": "7.1.2", + "handlebars": "4.0.10", + "highlight.js": "8.9.1", + "js-yaml": "3.7.0", + "marked": "0.3.6", + "nopt": "4.0.1", + "slash": "1.0.0", + "strip-bom": "2.0.0", + "through2": "2.0.3", + "vinyl-fs": "2.4.4" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "cliui": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "center-align": "0.1.3", + "right-align": "0.1.3", + "wordwrap": "0.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "glob": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "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" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "handlebars": { "version": "4.0.10", "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz", "integrity": "sha1-PTDHGLCaPZbyPqTMH0A8TTup/08=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "async": "1.5.2", + "optimist": "0.6.1", + "source-map": "0.4.4", + "uglify-js": "2.8.29" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "highlight.js": { "version": "8.9.1", @@@ -5533,13 -7903,20 +9695,28 @@@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "abbrev": "1.1.0", + "osenv": "0.1.4" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "source-map": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "amdefine": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "uglify-js": { "version": "2.8.29", @@@ -5547,6 -7924,11 +9724,14 @@@ "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", "dev": true, "optional": true, ++<<<<<<< HEAD ++======= + "requires": { + "source-map": "0.5.7", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "source-map": { "version": "0.5.7", @@@ -5576,7 -7958,13 +9761,17 @@@ "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", + "window-size": "0.1.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -5584,25 -7972,42 +9779,58 @@@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/param-case/-/param-case-1.1.2.tgz", "integrity": "sha1-3LCRpDwlm5Io8cNB57akTqC/l0M=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "sentence-case": "1.1.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "parse-filepath": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.1.tgz", "integrity": "sha1-FZ1hVdQ5BNFsEO9piRHaHpGWm3M=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "is-absolute": "0.2.6", + "map-cache": "0.2.2", + "path-root": "0.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "parse-glob": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "glob-base": "0.3.0", + "is-dotfile": "1.0.3", + "is-extglob": "1.0.0", + "is-glob": "2.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "parse-json": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "error-ex": "1.3.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "parse-passwd": { "version": "1.0.0", @@@ -5621,19 -8026,28 +9849,40 @@@ "version": "0.0.3", "resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz", "integrity": "sha1-q343WfIJ7OmUN5c/fQ8fZK4OZKs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "better-assert": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "parseqs": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz", "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "better-assert": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "parseuri": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz", "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "better-assert": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "parseurl": { "version": "1.3.2", @@@ -5645,13 -8059,20 +9894,28 @@@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-1.1.2.tgz", "integrity": "sha1-Pl1kogBDgwp8STRMLXS0G+DJyZs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "camel-case": "1.2.2", + "upper-case-first": "1.1.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "path-case": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/path-case/-/path-case-1.1.2.tgz", "integrity": "sha1-UM5roNO+090LXCqcRVNpdDRAlRQ=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "sentence-case": "1.1.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "path-dirname": { "version": "1.0.2", @@@ -5663,7 -8084,10 +9927,14 @@@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "pinkie-promise": "2.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "path-is-absolute": { "version": "1.0.1", @@@ -5693,7 -8117,10 +9964,14 @@@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "path-root-regex": "0.1.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "path-root-regex": { "version": "0.1.2", @@@ -5705,13 -8132,21 +9983,29 @@@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "pause-stream": { "version": "0.0.11", "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "through": "2.3.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "performance-now": { "version": "0.2.0", @@@ -5735,7 -8170,10 +10029,14 @@@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "pinkie": "2.0.4" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "pluralize": { "version": "1.2.1", @@@ -5747,19 -8185,31 +10048,42 @@@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/portscanner/-/portscanner-2.1.1.tgz", "integrity": "sha1-6rtAnk3iSVD1oqUW01rnaTQ/u5Y=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "async": "1.5.2", + "is-number-like": "1.0.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "postcss": { "version": "4.1.16", "resolved": "https://registry.npmjs.org/postcss/-/postcss-4.1.16.tgz", "integrity": "sha1-TESbTIr53zyvbTf44eV10DYXWNw=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "es6-promise": "2.3.0", + "js-base64": "2.1.9", + "source-map": "0.4.4" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "source-map": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "amdefine": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -5768,18 -8218,32 +10092,43 @@@ "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz", "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "postcss": "5.2.17", + "postcss-message-helpers": "2.0.0", + "reduce-css-calc": "1.3.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "postcss": { "version": "5.2.17", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "has-flag": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -5788,18 -8252,32 +10137,43 @@@ "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz", "integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "colormin": "1.1.2", + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "postcss": { "version": "5.2.17", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "has-flag": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -5808,18 -8286,31 +10182,42 @@@ "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz", "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "postcss": { "version": "5.2.17", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "has-flag": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -5828,18 -8319,30 +10226,41 @@@ "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz", "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "postcss": "5.2.17" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "postcss": { "version": "5.2.17", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "has-flag": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -5848,18 -8351,30 +10269,41 @@@ "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz", "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "postcss": "5.2.17" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "postcss": { "version": "5.2.17", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "has-flag": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -5868,18 -8383,30 +10312,41 @@@ "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz", "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "postcss": "5.2.17" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "postcss": { "version": "5.2.17", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "has-flag": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -5888,18 -8415,30 +10355,41 @@@ "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz", "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "postcss": "5.2.17" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "postcss": { "version": "5.2.17", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "has-flag": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -5908,18 -8447,31 +10398,42 @@@ "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz", "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "postcss": "5.2.17", + "uniqs": "2.0.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "postcss": { "version": "5.2.17", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "has-flag": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -5928,18 -8480,31 +10442,42 @@@ "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz", "integrity": "sha1-bYWGJTTXNaxCDkqFgG4fXUKG2Ew=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "postcss": "5.2.17", + "uniqid": "4.1.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "postcss": { "version": "5.2.17", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "has-flag": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -5948,18 -8513,32 +10486,43 @@@ "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz", "integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "has": "1.0.1", + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "postcss": { "version": "5.2.17", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "has-flag": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -5968,18 -8547,30 +10531,41 @@@ "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz", "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "postcss": "5.2.17" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "postcss": { "version": "5.2.17", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "has-flag": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -5988,24 -8579,44 +10574,59 @@@ "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz", "integrity": "sha1-0d9d+qexrMO+VT8OnhDofGG19yE=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "browserslist": "1.7.7", + "caniuse-api": "1.6.1", + "postcss": "5.2.17", + "postcss-selector-parser": "2.2.3", + "vendors": "1.0.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "browserslist": { "version": "1.7.7", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "caniuse-db": "1.0.30000733", + "electron-to-chromium": "1.3.21" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "postcss": { "version": "5.2.17", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "has-flag": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -6020,18 -8631,32 +10641,43 @@@ "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz", "integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "object-assign": "4.1.1", + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "postcss": { "version": "5.2.17", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "has-flag": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -6040,18 -8665,31 +10686,42 @@@ "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz", "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "postcss": { "version": "5.2.17", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "has-flag": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -6060,18 -8698,33 +10730,44 @@@ "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz", "integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "alphanum-sort": "1.0.2", + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0", + "uniqs": "2.0.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "postcss": { "version": "5.2.17", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "has-flag": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -6080,18 -8733,33 +10776,44 @@@ "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz", "integrity": "sha1-ssapjAByz5G5MtGkllCBFDEXNb8=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "alphanum-sort": "1.0.2", + "has": "1.0.1", + "postcss": "5.2.17", + "postcss-selector-parser": "2.2.3" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "postcss": { "version": "5.2.17", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "has-flag": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -6100,18 -8768,30 +10822,41 @@@ "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz", "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "postcss": "5.2.17" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "postcss": { "version": "5.2.17", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "has-flag": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -6120,18 -8800,33 +10865,44 @@@ "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz", "integrity": "sha1-EI90s/L82viRov+j6kWSJ5/HgiI=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "is-absolute-url": "2.1.0", + "normalize-url": "1.9.1", + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "postcss": { "version": "5.2.17", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "has-flag": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -6140,18 -8835,31 +10911,42 @@@ "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz", "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "postcss": { "version": "5.2.17", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "has-flag": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -6160,18 -8868,31 +10955,42 @@@ "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz", "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "postcss": { "version": "5.2.17", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "has-flag": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -6180,18 -8901,30 +10999,41 @@@ "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz", "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "postcss": "5.2.17" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "postcss": { "version": "5.2.17", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "has-flag": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -6200,18 -8933,32 +11042,43 @@@ "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz", "integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "has": "1.0.1", + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "postcss": { "version": "5.2.17", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "has-flag": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -6219,25 -8966,45 +11086,60 @@@ "version": "2.2.3", "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz", "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "flatten": "1.0.2", + "indexes-of": "1.0.1", + "uniq": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "postcss-svgo": { "version": "2.1.6", "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz", "integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "is-svg": "2.1.0", + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0", + "svgo": "0.7.2" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "postcss": { "version": "5.2.17", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "has-flag": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -6246,18 -9013,32 +11148,43 @@@ "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz", "integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "alphanum-sort": "1.0.2", + "postcss": "5.2.17", + "uniqs": "2.0.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "postcss": { "version": "5.2.17", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "has-flag": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -6272,18 -9053,32 +11199,43 @@@ "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz", "integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "has": "1.0.1", + "postcss": "5.2.17", + "uniqs": "2.0.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "postcss": { "version": "5.2.17", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "has-flag": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -6327,7 -9122,10 +11279,14 @@@ "version": "7.3.1", "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "asap": "2.0.6" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "promise.prototype.finally": { "version": "1.0.1", @@@ -6369,7 -9167,11 +11328,15 @@@ "version": "4.3.4", "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz", "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "object-assign": "4.1.1", + "strict-uri-encode": "1.1.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "querystring": { "version": "0.2.0", @@@ -6382,18 -9184,28 +11349,38 @@@ "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "is-number": "3.0.0", + "kind-of": "4.0.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "is-number": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "kind-of": "3.2.2" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "is-buffer": "1.1.5" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -6401,7 -9213,10 +11388,14 @@@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "is-buffer": "1.1.5" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -6416,6 -9231,12 +11410,15 @@@ "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz", "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "deep-extend": "0.4.2", + "ini": "1.3.4", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "minimist": { "version": "1.2.0", @@@ -6435,31 -9256,60 +11438,79 @@@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "read-pkg-up": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "find-up": "1.1.2", + "read-pkg": "1.1.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "readable-stream": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "readdirp": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "minimatch": "3.0.4", + "readable-stream": "2.3.3", + "set-immediate-shim": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "readline2": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz", "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "mute-stream": "0.0.5" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "mute-stream": { "version": "0.0.5", @@@ -6473,13 -9323,20 +11524,28 @@@ "version": "0.6.2", "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "resolve": "1.4.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "redent": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "indent-string": "2.1.0", + "strip-indent": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "reduce-component": { "version": "1.0.1", @@@ -6492,6 -9349,11 +11558,14 @@@ "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz", "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "balanced-match": "0.4.2", + "math-expression-evaluator": "1.2.17", + "reduce-function-call": "1.0.2" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "balanced-match": { "version": "0.4.2", @@@ -6506,6 -9368,9 +11580,12 @@@ "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz", "integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "balanced-match": "0.4.2" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "balanced-match": { "version": "0.4.2", @@@ -6525,19 -9390,29 +11605,41 @@@ "version": "0.4.4", "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "is-equal-shallow": "0.1.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "registry-auth-token": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.1.tgz", "integrity": "sha1-+w0yie4Nmtosu1KvXf5mywcNMAY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "rc": "1.2.1", + "safe-buffer": "5.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "registry-url": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz", "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "rc": "1.2.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "relateurl": { "version": "0.2.7", @@@ -6549,7 -9424,10 +11651,14 @@@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/remote-content/-/remote-content-1.0.1.tgz", "integrity": "sha1-DDcONnAe3CKB19FyLUJzCD0TcWM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "superagent": "1.8.5" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "remove-trailing-separator": { "version": "1.1.0", @@@ -6573,7 -9451,10 +11682,14 @@@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "is-finite": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "replace-ext": { "version": "0.0.1", @@@ -6586,6 -9467,30 +11702,33 @@@ "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "aws-sign2": "0.6.0", + "aws4": "1.6.0", + "caseless": "0.12.0", + "combined-stream": "1.0.5", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.1.4", + "har-validator": "4.2.1", + "hawk": "3.1.3", + "http-signature": "1.1.1", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.17", + "oauth-sign": "0.8.2", + "performance-now": "0.2.0", + "qs": "6.4.0", + "safe-buffer": "5.1.1", + "stringstream": "0.0.5", + "tough-cookie": "2.3.2", + "tunnel-agent": "0.6.0", + "uuid": "3.1.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "qs": { "version": "6.4.0", @@@ -6617,7 -9522,11 +11760,15 @@@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz", "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "caller-path": "0.1.0", + "resolve-from": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "requires-port": { "version": "1.0.0", @@@ -6630,6 -9539,9 +11781,12 @@@ "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.1.tgz", "integrity": "sha1-aUPDUwxNmn5G8c3dUcFY/GcM294=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "underscore": "1.6.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "underscore": { "version": "1.6.0", @@@ -6643,13 -9555,20 +11800,28 @@@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz", "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "path-parse": "1.0.5" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "resolve-dir": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz", "integrity": "sha1-shklmlYC+sXFxJatiUpujMQwJh4=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "expand-tilde": "1.2.2", + "global-modules": "0.2.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "resolve-from": { "version": "1.0.1", @@@ -6667,31 -9586,53 +11839,72 @@@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/resp-modifier/-/resp-modifier-6.0.2.tgz", "integrity": "sha1-sSTeXE+6/LpUH0j/pzlw9KpFa08=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "debug": "2.2.0", + "minimatch": "3.0.4" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "restore-cursor": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz", "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "exit-hook": "1.1.1", + "onetime": "1.1.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "right-align": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "align-text": "0.1.4" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "rimraf": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "glob": "7.1.2" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "glob": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "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" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -6699,13 -9640,20 +11912,28 @@@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz", "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "once": "1.4.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "run-sequence": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/run-sequence/-/run-sequence-1.2.2.tgz", "integrity": "sha1-UJWgvr6YczsBQL0I3YDsAw3azes=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "gulp-util": "3.0.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "rx": { "version": "4.1.0", @@@ -6730,6 -9678,11 +11958,14 @@@ "resolved": "https://registry.npmjs.org/safe-wipe/-/safe-wipe-0.2.4.tgz", "integrity": "sha1-U7k113dbc5qSS1FslbskF/qaRR4=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "extend": "2.0.1", + "q": "1.5.0", + "rimraf": "2.6.2" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "extend": { "version": "2.0.1", @@@ -6744,6 -9697,19 +11980,22 @@@ "resolved": "https://registry.npmjs.org/sass-convert/-/sass-convert-0.5.2.tgz", "integrity": "sha1-se1CsOjW/pjsftbnijjiZWSGDwY=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "concat-stream": "1.5.2", + "dargs": "4.1.0", + "ends-with": "0.2.0", + "es6-denodeify": "0.1.5", + "es6-promise": "3.3.1", + "memoize-decorator": "1.0.2", + "object-assign": "3.0.0", + "semver": "5.4.1", + "semver-regex": "1.0.0", + "through2": "2.0.3", + "which": "1.3.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "es6-promise": { "version": "3.3.1", @@@ -6764,6 -9730,12 +12016,15 @@@ "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz", "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "glob": "7.1.2", + "lodash": "4.17.4", + "scss-tokenizer": "0.2.3", + "yargs": "7.1.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "camelcase": { "version": "3.0.0", @@@ -6775,7 -9747,15 +12036,19 @@@ "version": "7.1.2", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "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" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lodash": { "version": "4.17.4", @@@ -6787,13 -9767,31 +12060,39 @@@ "version": "7.1.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz", "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "camelcase": "3.0.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "y18n": "3.2.1", + "yargs-parser": "5.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "yargs-parser": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz", "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "camelcase": "3.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -6802,18 -9800,47 +12101,58 @@@ "resolved": "https://registry.npmjs.org/sass-lint/-/sass-lint-1.11.1.tgz", "integrity": "sha512-vt29dGRlNDywZUsJOxhh8cGtpRWIqrsGS85U0WnAyMdywnUyiPXV3/HNKtkg7hmm6pRjpYE9806u/GT0oI+lMQ==", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "commander": "2.11.0", + "eslint": "2.13.1", + "front-matter": "2.1.2", + "fs-extra": "3.0.1", + "glob": "7.1.2", + "globule": "1.2.0", + "gonzales-pe": "4.2.2", + "js-yaml": "3.7.0", + "known-css-properties": "0.3.0", + "lodash.capitalize": "4.2.1", + "lodash.kebabcase": "4.1.1", + "merge": "1.2.0", + "path-is-absolute": "1.0.1", + "util": "0.10.3" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "glob": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "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" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "globule": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz", "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "glob": "7.1.2", + "lodash": "4.17.4", + "minimatch": "3.0.4" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "lodash": { "version": "4.17.4", @@@ -6828,18 -9855,50 +12167,61 @@@ "resolved": "https://registry.npmjs.org/sassdoc/-/sassdoc-2.3.0.tgz", "integrity": "sha512-Cv4KQmx0UW9yQ0MRib7j5DVPqloA8nF0SF8fdptw3Au31eWCDtOXLqkjZCYT0TYDgx4eN5vRKa81+OI5ZZUYxQ==", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "babel-runtime": "6.26.0", + "chalk": "1.1.3", + "concat-stream": "1.6.0", + "docopt": "0.6.2", + "glob": "7.1.2", + "glob2base": "0.0.12", + "js-yaml": "3.10.0", + "lodash.difference": "4.5.0", + "lodash.uniq": "4.5.0", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "multipipe": "1.0.2", + "rimraf": "2.6.2", + "safe-wipe": "0.2.4", + "sass-convert": "0.5.2", + "sassdoc-theme-default": "2.6.1", + "scss-comment-parser": "0.8.3", + "strip-indent": "2.0.0", + "through2": "1.1.1", + "update-notifier": "2.2.0", + "vinyl-fs": "2.4.4", + "vinyl-source-stream": "1.1.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "concat-stream": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz", "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.3.3", + "typedarray": "0.0.6" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "duplexer2": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "readable-stream": "2.3.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "esprima": { "version": "4.0.0", @@@ -6851,7 -9910,15 +12233,19 @@@ "version": "7.1.2", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "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" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "isarray": { "version": "0.0.1", @@@ -6863,7 -9930,11 +12257,15 @@@ "version": "3.10.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz", "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "argparse": "1.0.9", + "esprima": "4.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "minimist": { "version": "0.0.8", @@@ -6875,13 -9946,20 +12277,28 @@@ "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "minimist": "0.0.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "multipipe": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-1.0.2.tgz", "integrity": "sha1-zBPv2DPJzamfIk+GhGG44aP9k50=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "duplexer2": "0.1.4", + "object-assign": "4.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "string_decoder": { "version": "0.10.31", @@@ -6900,12 -9978,22 +12317,29 @@@ "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz", "integrity": "sha1-CEfLxESfNAVXTb3M2buEG4OsNUU=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "readable-stream": "1.1.14", + "xtend": "4.0.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "readable-stream": { "version": "1.1.14", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } } @@@ -6915,25 -10003,47 +12349,62 @@@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/sassdoc-extras/-/sassdoc-extras-2.4.1.tgz", "integrity": "sha1-1px4MUKo/kJ8crsy/NZS8doD+Ao=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "marked": "0.3.6" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "sassdoc-theme-default": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/sassdoc-theme-default/-/sassdoc-theme-default-2.6.1.tgz", "integrity": "sha1-bUhZZloVqKli/oBj5nWnyGESpgg=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "babel-runtime": "6.26.0", + "chroma-js": "1.3.4", + "es6-denodeify": "0.1.5", + "es6-promise": "4.1.1", + "extend": "3.0.1", + "fs-extra": "2.1.2", + "html-minifier": "3.5.5", + "sassdoc-extras": "2.4.1", + "swig": "1.4.0", + "swig-extras": "0.0.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "camel-case": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "no-case": "2.3.2", + "upper-case": "1.1.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "clean-css": { "version": "4.1.9", "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.9.tgz", "integrity": "sha1-Nc7ornaHpJuYA09w3gDE7dOCYwE=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "source-map": "0.5.7" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "es6-promise": { "version": "4.1.1", @@@ -6945,7 -10055,11 +12416,15 @@@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz", "integrity": "sha1-BGxwFjzvmq1GsOSn+kZ/si1x3jU=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "2.4.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "he": { "version": "1.1.1", @@@ -6957,25 -10071,45 +12436,61 @@@ "version": "3.5.5", "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.5.tgz", "integrity": "sha512-g+1+NBycQI0fGnggd52JM8TRUweG7+9W2wrtjGitMAqc4G7maweAHvVAAjz9veHseIH3tYKE2lk2USGSoewIrQ==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "camel-case": "3.0.0", + "clean-css": "4.1.9", + "commander": "2.11.0", + "he": "1.1.1", + "ncname": "1.0.0", + "param-case": "2.1.1", + "relateurl": "0.2.7", + "uglify-js": "3.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "jsonfile": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "graceful-fs": "4.1.11" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "param-case": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "no-case": "2.3.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "uglify-js": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.1.tgz", "integrity": "sha512-f7DpmEgt/RYAKzQzcfahn3JYZHobDwTZCa8oixC7pweVGEIizTX2kTYdNWcdk00xsMJqUhI8RDAa9HXHXGhNxA==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "commander": "2.11.0", + "source-map": "0.5.7" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -6989,19 -10123,29 +12504,40 @@@ "version": "0.8.3", "resolved": "https://registry.npmjs.org/scss-comment-parser/-/scss-comment-parser-0.8.3.tgz", "integrity": "sha512-qc0uF3R1QKfJAUN+9nh3CA0Wex6JkW+lcxMLxR/RYhzoeBmjTRhjhaLGf50O3OeBxhLcwbVtDr7/X0cFWysGbA==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "cdocparser": "0.13.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "scss-tokenizer": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz", "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "js-base64": "2.1.9", + "source-map": "0.4.4" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "source-map": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "amdefine": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -7015,7 -10159,10 +12551,14 @@@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz", "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "semver": "5.4.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "semver-regex": { "version": "1.0.0", @@@ -7028,12 -10175,30 +12571,36 @@@ "resolved": "https://registry.npmjs.org/send/-/send-0.15.2.tgz", "integrity": "sha1-+R+rRAO8+H5xb3DOtdsvV4vcF9Y=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "debug": "2.6.4", + "depd": "1.1.1", + "destroy": "1.0.4", + "encodeurl": "1.0.1", + "escape-html": "1.0.3", + "etag": "1.8.1", + "fresh": "0.5.0", + "http-errors": "1.6.2", + "mime": "1.3.4", + "ms": "1.0.0", + "on-finished": "2.3.0", + "range-parser": "1.2.0", + "statuses": "1.3.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "debug": { "version": "2.6.4", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.4.tgz", "integrity": "sha1-dYaps8OXQcAoKuM0RcTorHRzT+A=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "ms": "0.7.3" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "ms": { "version": "0.7.3", @@@ -7053,7 -10218,13 +12620,17 @@@ "version": "1.6.2", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz", "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "depd": "1.1.1", + "inherits": "2.0.3", + "setprototypeof": "1.0.3", + "statuses": "1.3.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "mime": { "version": "1.3.4", @@@ -7079,7 -10250,10 +12656,14 @@@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-1.1.3.tgz", "integrity": "sha1-gDSq/CFFdy06vhUJqkLJ4QQtwTk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lower-case": "1.1.4" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "sequencify": { "version": "0.0.7", @@@ -7091,13 -10265,28 +12675,36 @@@ "version": "1.8.0", "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.8.0.tgz", "integrity": "sha1-fF2WwT+xMRAfk8HFd0+FFqHnjTs=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "accepts": "1.3.4", + "batch": "0.5.3", + "debug": "2.2.0", + "escape-html": "1.0.3", + "http-errors": "1.5.1", + "mime-types": "2.1.17", + "parseurl": "1.3.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "serve-static": { "version": "1.12.2", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.12.2.tgz", "integrity": "sha1-5UbicmCBuBtLzsjpCAjrzdMjr7o=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "encodeurl": "1.0.1", + "escape-html": "1.0.3", + "parseurl": "1.3.2", + "send": "0.15.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "server-destroy": { "version": "1.0.1", @@@ -7127,7 -10316,10 +12734,14 @@@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "shebang-regex": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "shebang-regex": { "version": "1.0.0", @@@ -7157,7 -10349,11 +12771,15 @@@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/siphon-media-query/-/siphon-media-query-1.0.0.tgz", "integrity": "sha1-GXPXJg1ekqMi/Cc3LxyiJAWeU8g=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "css-parse": "2.0.0", + "css-stringify": "2.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "slash": { "version": "1.0.0", @@@ -7181,25 -10377,43 +12803,58 @@@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-1.1.2.tgz", "integrity": "sha1-DC8l4wUVjZoY09l3BmGH/vilpmo=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "sentence-case": "1.1.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "sntp": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "hoek": "2.16.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "socket.io": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.6.0.tgz", "integrity": "sha1-PkDZMmN+a9kjmBslyvfFPoO24uE=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "debug": "2.3.3", + "engine.io": "1.8.0", + "has-binary": "0.1.7", + "object-assign": "4.1.0", + "socket.io-adapter": "0.5.0", + "socket.io-client": "1.6.0", + "socket.io-parser": "2.3.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "debug": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "ms": "0.7.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "ms": { "version": "0.7.2", @@@ -7220,12 -10434,19 +12875,26 @@@ "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz", "integrity": "sha1-y21LuL7IHhB4uZZ3+c7QBGBmu4s=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "debug": "2.3.3", + "socket.io-parser": "2.3.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "debug": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "ms": "0.7.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "ms": { "version": "0.7.2", @@@ -7240,6 -10461,19 +12909,22 @@@ "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.6.0.tgz", "integrity": "sha1-W2aPT3cTBN/u0XkGRwg4b6ZxeFM=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "backo2": "1.0.2", + "component-bind": "1.0.0", + "component-emitter": "1.2.1", + "debug": "2.3.3", + "engine.io-client": "1.8.0", + "has-binary": "0.1.7", + "indexof": "0.0.1", + "object-component": "0.0.3", + "parseuri": "0.0.5", + "socket.io-parser": "2.3.1", + "to-array": "0.1.4" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "component-emitter": { "version": "1.2.1", @@@ -7251,7 -10485,10 +12936,14 @@@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "ms": "0.7.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "ms": { "version": "0.7.2", @@@ -7266,6 -10503,12 +12958,15 @@@ "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz", "integrity": "sha1-3VMgJRA85Clpcya+/WQAX8/ltKA=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "component-emitter": "1.1.2", + "debug": "2.2.0", + "isarray": "0.0.1", + "json3": "3.3.2" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "isarray": { "version": "0.0.1", @@@ -7279,7 -10522,10 +12980,14 @@@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "is-plain-obj": "1.1.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "source-map": { "version": "0.5.7", @@@ -7291,7 -10537,13 +12999,17 @@@ "version": "0.3.1", "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.3.1.tgz", "integrity": "sha1-YQ9hIqRFuN1RU1oqcbeD38Ekh2E=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "atob": "1.1.3", + "resolve-url": "0.2.1", + "source-map-url": "0.3.0", + "urix": "0.1.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "source-map-url": { "version": "0.3.0", @@@ -7309,7 -10561,10 +13027,14 @@@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "spdx-license-ids": "1.2.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "spdx-expression-parse": { "version": "1.0.4", @@@ -7327,7 -10582,10 +13052,14 @@@ "version": "0.3.3", "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz", "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "through": "2.3.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "sprintf-js": { "version": "1.0.3", @@@ -7340,6 -10598,16 +13072,19 @@@ "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz", "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "asn1": "0.2.3", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.1", + "getpass": "0.1.7", + "jsbn": "0.1.1", + "tweetnacl": "0.14.5" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "assert-plus": { "version": "1.0.0", @@@ -7359,13 -10627,19 +13104,27 @@@ "version": "0.0.4", "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz", "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "duplexer": "0.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "stream-connect": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/stream-connect/-/stream-connect-1.0.2.tgz", "integrity": "sha1-GLyB8u2zW4tdmoAJIAqYUxRCipc=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "array-back": "1.0.4" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "stream-consume": { "version": "0.1.0", @@@ -7383,7 -10657,11 +13142,15 @@@ "version": "0.1.3", "resolved": "https://registry.npmjs.org/stream-throttle/-/stream-throttle-0.1.3.tgz", "integrity": "sha1-rdV8jXzHOoFjDTHNVdOWHPr7qcM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "commander": "2.11.0", + "limiter": "1.1.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "stream-via": { "version": "1.0.4", @@@ -7401,7 -10679,10 +13168,14 @@@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "string-template": { "version": "1.0.0", @@@ -7413,7 -10694,12 +13187,16 @@@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "stringstream": { "version": "0.0.5", @@@ -7425,19 -10711,29 +13208,41 @@@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "strip-bom": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "is-utf8": "0.2.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "strip-bom-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz", "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "first-chunk-stream": "1.0.0", + "strip-bom": "2.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "strip-eof": { "version": "1.0.0", @@@ -7449,7 -10745,10 +13254,14 @@@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "get-stdin": "4.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "strip-json-comments": { "version": "1.0.4", @@@ -7461,19 -10760,41 +13273,52 @@@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/style-data/-/style-data-1.1.2.tgz", "integrity": "sha1-2fSoAuy3ZDMWVg02TEta+jk1qJ0=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "cheerio": "0.19.0", + "extend": "3.0.1", + "mediaquery-text": "1.0.2", + "object.pick": "1.3.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "style-selector": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/style-selector/-/style-selector-1.0.3.tgz", "integrity": "sha1-yhSK8egIoTKTxpAGlcnNgRO+B8I=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "slick": "1.12.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "superagent": { "version": "1.8.5", "resolved": "https://registry.npmjs.org/superagent/-/superagent-1.8.5.tgz", "integrity": "sha1-HA3cOvMOgOuE68BcshItqP6UC1U=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "component-emitter": "1.2.1", + "cookiejar": "2.0.6", + "debug": "2.2.0", + "extend": "3.0.0", + "form-data": "1.0.0-rc3", + "formidable": "1.0.17", + "methods": "1.1.2", + "mime": "1.3.4", + "qs": "2.3.3", + "readable-stream": "1.0.27-1", + "reduce-component": "1.0.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "component-emitter": { "version": "1.2.1", @@@ -7491,7 -10812,12 +13336,16 @@@ "version": "1.0.0-rc3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz", "integrity": "sha1-01vGLn+8KTeuePlIqqDTjZBgdXc=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "async": "1.5.2", + "combined-stream": "1.0.5", + "mime-types": "2.1.17" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "isarray": { "version": "0.0.1", @@@ -7515,7 -10841,13 +13369,17 @@@ "version": "1.0.27-1", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz", "integrity": "sha1-a2eYPCA1fO/QfwFlABoW1xDZEHg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "string_decoder": { "version": "0.10.31", @@@ -7530,6 -10862,28 +13394,31 @@@ "resolved": "https://registry.npmjs.org/supercollider/-/supercollider-1.4.2.tgz", "integrity": "sha1-0zucTuwCWkmX2rv0+pVYE5fUBiQ=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "async": "0.9.2", + "chalk": "1.1.3", + "commander": "2.11.0", + "escape-html": "1.0.3", + "extend": "3.0.1", + "front-matter": "1.0.0", + "glob": "4.5.3", + "glob-all": "3.1.0", + "gulp-util": "3.0.8", + "handlebars": "2.0.0", + "js-yaml": "3.7.0", + "jsdoc-api": "1.2.4", + "jsdoc3-parser": "1.1.0", + "marked": "0.3.6", + "mkdirp": "0.5.1", + "rimraf": "2.6.2", + "sassdoc": "2.3.0", + "string-template": "0.2.1", + "through2": "0.6.5", + "vinyl-fs": "1.0.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "async": { "version": "0.9.2", @@@ -7547,37 -10901,64 +13436,88 @@@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/front-matter/-/front-matter-1.0.0.tgz", "integrity": "sha1-8bFbYN4arHV+W+wE8OB1HAae9T0=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "yaml-js": "0.1.5" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "glob": { "version": "4.5.3", "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz", "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "2.0.10", + "once": "1.4.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "glob-stream": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-4.1.1.tgz", "integrity": "sha1-uELfENaIx+trz869hG84UilrMgA=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "glob": "4.5.3", + "glob2base": "0.0.12", + "minimatch": "2.0.10", + "ordered-read-streams": "0.1.0", + "through2": "0.6.5", + "unique-stream": "2.2.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "glob-watcher": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.8.tgz", "integrity": "sha1-aK62Yefizo02NDgbLsQV8AxrwqQ=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "gaze": "0.5.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "graceful-fs": { "version": "3.0.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz", "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "natives": "1.1.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "handlebars": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz", "integrity": "sha1-bp1/hRSjRn+l6fgswVjs/B1ax28=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "optimist": "0.3.7", + "uglify-js": "2.3.6" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "isarray": { "version": "0.0.1", @@@ -7589,13 -10970,19 +13529,27 @@@ "version": "0.1.8", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-0.1.8.tgz", "integrity": "sha1-SKB7O0oSHXSj7b/c20sIrb8CQLE=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "through2": "0.6.5" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "minimatch": { "version": "2.0.10", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "brace-expansion": "1.1.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "minimist": { "version": "0.0.8", @@@ -7607,7 -10994,10 +13561,14 @@@ "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "minimist": "0.0.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "object-assign": { "version": "2.1.1", @@@ -7619,7 -11009,10 +13580,14 @@@ "version": "0.3.7", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz", "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "wordwrap": "0.0.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "ordered-read-streams": { "version": "0.1.0", @@@ -7631,7 -11024,13 +13599,17 @@@ "version": "1.0.34", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "string_decoder": { "version": "0.10.31", @@@ -7649,25 -11048,49 +13627,65 @@@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz", "integrity": "sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "first-chunk-stream": "1.0.0", + "is-utf8": "0.2.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "through2": { "version": "0.6.5", "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "vinyl": { "version": "0.4.6", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "clone": "0.2.0", + "clone-stats": "0.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "vinyl-fs": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-1.0.0.tgz", "integrity": "sha1-0VdS5owtrXQ2Tn6FNHNzU1RpLt8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "duplexify": "3.5.1", + "glob-stream": "4.1.1", + "glob-watcher": "0.0.8", + "graceful-fs": "3.0.11", + "merge-stream": "0.1.8", + "mkdirp": "0.5.1", + "object-assign": "2.1.1", + "strip-bom": "1.0.0", + "through2": "0.6.5", + "vinyl": "0.4.6" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "wordwrap": { "version": "0.0.3", @@@ -7688,6 -11111,15 +13706,18 @@@ "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz", "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "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" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "minimist": { "version": "0.0.8", @@@ -7699,7 -11131,10 +13729,14 @@@ "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "minimist": "0.0.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -7707,13 -11142,21 +13744,28 @@@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/swap-case/-/swap-case-1.1.2.tgz", "integrity": "sha1-w5IDpFhzhfrTyFCgvRvK+ggZdOM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "lower-case": "1.1.4", + "upper-case": "1.1.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "swig": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/swig/-/swig-1.4.0.tgz", "integrity": "sha1-4OYGoImfiGp67npF0bOYwrJdJdE=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "optimist": "0.6.1", + "uglify-js": "2.4.24" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "async": { "version": "0.2.10", @@@ -7725,13 -11168,22 +13777,30 @@@ "version": "0.1.34", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz", "integrity": "sha1-p8/omux7FoLDsZjQrPtH19CQVms=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "amdefine": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "uglify-js": { "version": "2.4.24", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz", "integrity": "sha1-+tV1XB4Vd2WLsG/5q25UjJW+vW4=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "async": "0.2.10", + "source-map": "0.1.34", + "uglify-to-browserify": "1.0.2", + "yargs": "3.5.4" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "window-size": { "version": "0.1.0", @@@ -7749,7 -11201,13 +13818,17 @@@ "version": "3.5.4", "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz", "integrity": "sha1-2K/49mXpTDS9JZvevRv68N3TU2E=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "camelcase": "1.2.1", + "decamelize": "1.2.0", + "window-size": "0.1.0", + "wordwrap": "0.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -7757,7 -11215,10 +13836,14 @@@ "version": "0.0.1", "resolved": "https://registry.npmjs.org/swig-extras/-/swig-extras-0.0.1.tgz", "integrity": "sha1-tQP+3jcqucJMasaMr2VrzvGHIyg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "markdown": "0.5.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "symbol-tree": { "version": "3.2.2", @@@ -7771,6 -11232,14 +13857,17 @@@ "resolved": "https://registry.npmjs.org/table/-/table-3.8.3.tgz", "integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "ajv": "4.11.8", + "ajv-keywords": "1.5.1", + "chalk": "1.1.3", + "lodash": "4.17.4", + "slice-ansi": "0.0.4", + "string-width": "2.1.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "ansi-regex": { "version": "3.0.0", @@@ -7794,13 -11263,20 +13891,28 @@@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "strip-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -7814,7 -11290,12 +13926,16 @@@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "block-stream": "0.0.9", + "fstream": "1.0.11", + "inherits": "2.0.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "temp-path": { "version": "1.0.0", @@@ -7826,13 -11307,22 +13947,30 @@@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz", "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "execa": "0.7.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "ternary-stream": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/ternary-stream/-/ternary-stream-2.0.1.tgz", "integrity": "sha1-Bk5Im0tb9gumpre8fy9cJ07Pgmk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "duplexify": "3.5.1", + "fork-stream": "0.0.4", + "merge-stream": "1.0.1", + "through2": "2.0.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "text-table": { "version": "0.2.0", @@@ -7844,13 -11334,20 +13982,28 @@@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/tfunk/-/tfunk-3.1.0.tgz", "integrity": "sha1-OORBT8ZJd9h6/apy+sttKfgve1s=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "chalk": "1.1.3", + "object-path": "0.9.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "then-fs": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/then-fs/-/then-fs-2.0.0.tgz", "integrity": "sha1-cveS3Z0xcFqRrhnr/Piz+WjIHaI=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "promise": "7.3.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "through": { "version": "2.3.8", @@@ -7862,19 -11359,30 +14015,42 @@@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "readable-stream": "2.3.3", + "xtend": "4.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "through2-filter": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz", "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "through2": "2.0.3", + "xtend": "4.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "tildify": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz", "integrity": "sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "os-homedir": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "time-stamp": { "version": "1.1.0", @@@ -7892,13 -11400,20 +14068,28 @@@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/title-case/-/title-case-1.1.2.tgz", "integrity": "sha1-+uSmrlRr+iLQg6DuqRCkDRLtT1o=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "sentence-case": "1.1.3", + "upper-case": "1.1.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "to-absolute-glob": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz", "integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "extend-shallow": "2.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "to-array": { "version": "0.1.4", @@@ -7907,10 -11422,13 +14098,20 @@@ "dev": true }, "tough-cookie": { ++<<<<<<< HEAD + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz", + "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=", + "dev": true ++======= + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz", + "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=", + "dev": true, + "requires": { + "punycode": "1.4.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "tr46": { "version": "0.0.3", @@@ -7935,7 -11453,10 +14136,14 @@@ "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "tweetnacl": { "version": "0.14.5", @@@ -7948,13 -11469,19 +14156,27 @@@ "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "prelude-ls": "1.1.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "typeahead.js": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/typeahead.js/-/typeahead.js-0.11.1.tgz", "integrity": "sha1-TmTmcbIjEKhgb0rsgFkkuoSwFbg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "jquery": "3.2.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "typedarray": { "version": "0.0.6", @@@ -7980,6 -11507,11 +14202,14 @@@ "integrity": "sha1-+gmEdwtCi3qbKoBY9GNV0U/vIRo=", "dev": true, "optional": true, ++<<<<<<< HEAD ++======= + "requires": { + "async": "0.2.10", + "optimist": "0.3.7", + "source-map": "0.1.43" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "async": { "version": "0.2.10", @@@ -7993,14 -11525,20 +14223,28 @@@ "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz", "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=", "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "wordwrap": "0.0.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "source-map": { "version": "0.1.43", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "amdefine": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "wordwrap": { "version": "0.0.3", @@@ -8040,6 -11578,9 +14284,12 @@@ "resolved": "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz", "integrity": "sha1-ZltmwkeD+PorGMn4y7Dix9SMJsc=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "underscore": "1.6.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "underscore": { "version": "1.6.0", @@@ -8059,7 -11600,10 +14309,14 @@@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-4.1.1.tgz", "integrity": "sha1-iSIN32t1GuUrX3JISGNShZa7hME=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "macaddress": "0.2.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "uniqs": { "version": "2.0.0", @@@ -8071,13 -11615,20 +14328,28 @@@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz", "integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "json-stable-stringify": "1.0.1", + "through2-filter": "2.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "unique-string": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz", "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "crypto-random-string": "1.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "universalify": { "version": "0.1.1", @@@ -8101,7 -11652,17 +14373,21 @@@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.2.0.tgz", "integrity": "sha1-G1g3z5DAc22IYncytmHBOPht5y8=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "boxen": "1.2.1", + "chalk": "1.1.3", + "configstore": "3.1.1", + "import-lazy": "2.1.0", + "is-npm": "1.0.0", + "latest-version": "3.1.0", + "semver-diff": "2.1.0", + "xdg-basedir": "3.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "upper-case": { "version": "1.1.3", @@@ -8113,7 -11674,10 +14399,14 @@@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-1.1.2.tgz", "integrity": "sha1-XXm+3P8UQZUY/S7bCgUHybaFkRU=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "upper-case": "1.1.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "urix": { "version": "0.1.0", @@@ -8125,7 -11689,10 +14418,14 @@@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "prepend-http": "1.0.4" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "user-home": { "version": "1.1.1", @@@ -8138,6 -11705,9 +14438,12 @@@ "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "inherits": "2.0.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "inherits": { "version": "2.0.1", @@@ -8169,7 -11739,10 +14475,14 @@@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz", "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "user-home": "1.1.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "vali-date": { "version": "1.0.0", @@@ -8181,7 -11754,11 +14494,15 @@@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "spdx-correct": "1.0.2", + "spdx-expression-parse": "1.0.4" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "vendors": { "version": "1.0.1", @@@ -8194,6 -11771,11 +14515,14 @@@ "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "assert-plus": "1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "1.3.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "assert-plus": { "version": "1.0.0", @@@ -8207,19 -11789,30 +14536,41 @@@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz", "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "clone": "1.0.2", + "clone-stats": "0.0.1", + "replace-ext": "0.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "vinyl-bufferstream": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/vinyl-bufferstream/-/vinyl-bufferstream-1.0.1.tgz", "integrity": "sha1-BTeGn1gO/6TKRay0dXnkuf5jCBo=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "bufferstreams": "1.0.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "bufferstreams": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.0.1.tgz", "integrity": "sha1-z7GtlWjTujz+k1upq92VLeiKqyo=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "readable-stream": "1.1.14" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "isarray": { "version": "0.0.1", @@@ -8231,7 -11824,13 +14582,17 @@@ "version": "1.1.14", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "string_decoder": { "version": "0.10.31", @@@ -8246,12 -11845,38 +14607,45 @@@ "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz", "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "duplexify": "3.5.1", + "glob-stream": "5.3.5", + "graceful-fs": "4.1.11", + "gulp-sourcemaps": "1.6.0", + "is-valid-glob": "0.3.0", + "lazystream": "1.0.0", + "lodash.isequal": "4.5.0", + "merge-stream": "1.0.1", + "mkdirp": "0.5.1", + "object-assign": "4.1.1", + "readable-stream": "2.3.3", + "strip-bom": "2.0.0", + "strip-bom-stream": "1.0.0", + "through2": "2.0.3", + "through2-filter": "2.0.0", + "vali-date": "1.0.0", + "vinyl": "1.2.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "gulp-sourcemaps": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz", "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "convert-source-map": "1.5.0", + "graceful-fs": "4.1.11", + "strip-bom": "2.0.0", + "through2": "2.0.3", + "vinyl": "1.2.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "minimist": { "version": "0.0.8", @@@ -8263,7 -11888,10 +14657,14 @@@ "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "minimist": "0.0.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -8272,6 -11900,10 +14673,13 @@@ "resolved": "https://registry.npmjs.org/vinyl-source-stream/-/vinyl-source-stream-1.1.0.tgz", "integrity": "sha1-RMvlEIIFJ53rDFZTwJSiiHk4sas=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "through2": "0.6.5", + "vinyl": "0.4.6" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "clone": { "version": "0.2.0", @@@ -8289,7 -11921,13 +14697,17 @@@ "version": "1.0.34", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "string_decoder": { "version": "0.10.31", @@@ -8301,13 -11939,21 +14719,29 @@@ "version": "0.6.5", "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "vinyl": { "version": "0.4.6", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "clone": "0.2.0", + "clone-stats": "0.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -8316,12 -11962,18 +14750,25 @@@ "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.1.4.tgz", "integrity": "sha1-xfy9Q+LyOEI8LcmL3db3m3K8NFs=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "source-map": "0.1.43" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "source-map": { "version": "0.1.43", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "amdefine": "1.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -8342,7 -11994,12 +14789,16 @@@ "version": "2.0.0-pre-I0Z7U9OV", "resolved": "https://registry.npmjs.org/weinre/-/weinre-2.0.0-pre-I0Z7U9OV.tgz", "integrity": "sha1-/viqIjkh97QLu71MPtQwL2/QqBM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "express": "2.5.11", + "nopt": "3.0.6", + "underscore": "1.7.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "what-input": { "version": "4.3.1", @@@ -8355,7 -12012,10 +14811,14 @@@ "resolved": "https://registry.npmjs.org/whatwg-url-compat/-/whatwg-url-compat-0.6.5.tgz", "integrity": "sha1-AImBEa9om7CXVBzVpFymyHmERb8=", "dev": true, ++<<<<<<< HEAD + "optional": true ++======= + "optional": true, + "requires": { + "tr46": "0.0.3" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "whet.extend": { "version": "0.9.9", @@@ -8367,7 -12027,10 +14830,14 @@@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "isexe": "2.0.0" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "which-module": { "version": "1.0.0", @@@ -8379,13 -12042,19 +14849,27 @@@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "string-width": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "widest-line": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz", "integrity": "sha1-DAnIXCqUaD0Nfq+O4JfVZL8OEFw=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "string-width": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "window-size": { "version": "0.1.4", @@@ -8403,7 -12072,11 +14887,15 @@@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "wrappy": { "version": "1.0.2", @@@ -8416,6 -12089,9 +14908,12 @@@ "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz", "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "mkdirp": "0.5.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "minimist": { "version": "0.0.8", @@@ -8427,7 -12103,10 +14925,14 @@@ "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "minimist": "0.0.8" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 } } }, @@@ -8435,13 -12114,22 +14940,30 @@@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz", "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "imurmurhash": "0.1.4", + "signal-exit": "3.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "ws": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz", "integrity": "sha1-CC3bbGQehdS7RR8D1S8G6r2x8Bg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "options": "0.0.6", + "ultron": "1.0.2" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "wtf-8": { "version": "1.0.0", @@@ -8509,6 -12197,22 +15031,25 @@@ "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.4.0.tgz", "integrity": "sha1-gW4ahm1VmMzzTlWW3c4i2S2kkNQ=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "camelcase": "3.0.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "window-size": "0.2.0", + "y18n": "3.2.1", + "yargs-parser": "4.2.1" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "camelcase": { "version": "3.0.0", @@@ -8529,6 -12233,9 +15070,12 @@@ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz", "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=", "dev": true, ++<<<<<<< HEAD ++======= + "requires": { + "camelcase": "3.0.0" + }, ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 "dependencies": { "camelcase": { "version": "3.0.0", @@@ -8542,7 -12249,10 +15089,14 @@@ "version": "2.4.2", "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.4.2.tgz", "integrity": "sha1-FMsZCD4eJacAksFYiqvg9OTdTYg=", ++<<<<<<< HEAD + "dev": true ++======= + "dev": true, + "requires": { + "buffer-crc32": "0.2.13" + } ++>>>>>>> c6c3d53e30bc36119e24c58b61ef31df60f91d90 }, "yeast": { "version": "0.1.2",