Merge branch 'rewrite' of https://notabug.org/RemixDevs/DeezloaderRemix into rewrite
[DeezloaderRemix.git] / package-lock.json
index 61ac6cc84c01061aa9d025be71ace876d32f5b7a..321051e4998cdd881dc46718a921ed1157bc22d3 100644 (file)
                        "dev": true
                },
                "ajv": {
+<<<<<<< HEAD
+                       "version": "6.7.0",
+                       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.7.0.tgz",
+                       "integrity": "sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg==",
+=======
                        "version": "6.6.2",
                        "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.2.tgz",
                        "integrity": "sha512-FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g==",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "dev": true,
                        "requires": {
                                "fast-deep-equal": "^2.0.1",
                        }
                },
                "app-builder-bin": {
+<<<<<<< HEAD
+                       "version": "2.6.3",
+                       "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-2.6.3.tgz",
+                       "integrity": "sha512-JL8C41e6yGIchFsHP/q15aGNedAaUakLhkV6ER0Yxafx08sRnlDnlkAkEIKjX7edg/4i7swpGa6CBv1zX9GgCA==",
+                       "dev": true
+               },
+               "app-builder-lib": {
+                       "version": "20.38.5",
+                       "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-20.38.5.tgz",
+                       "integrity": "sha512-vVgM9d9twwlhr+8vNAJOAD9dyVBRk7reuVa1BE1OmvaHb1M+fS8KpvcDKVdBqX9KDHy7zSc57mnIcHgax4/XMA==",
+                       "dev": true,
+                       "requires": {
+                               "7zip-bin": "~4.1.0",
+                               "app-builder-bin": "2.6.3",
+                               "async-exit-hook": "^2.0.1",
+                               "bluebird-lst": "^1.0.6",
+                               "builder-util": "9.6.2",
+                               "builder-util-runtime": "8.1.1",
+                               "chromium-pickle-js": "^0.2.0",
+                               "debug": "^4.1.1",
+                               "ejs": "^2.6.1",
+                               "electron-osx-sign": "0.4.11",
+                               "electron-publish": "20.38.5",
+                               "fs-extra-p": "^7.0.0",
+                               "hosted-git-info": "^2.7.1",
+                               "is-ci": "^2.0.0",
+                               "isbinaryfile": "^4.0.0",
+                               "js-yaml": "^3.12.1",
+=======
                        "version": "2.6.1",
                        "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-2.6.1.tgz",
                        "integrity": "sha512-W0l85O+s6lOaziWqAhszPfwiG0s15FvMBP9j9i/bknsMccUkwN60u4Cy7yYtf6akCUDuJenLqpTX4/xvkq1egw==",
                                "is-ci": "^2.0.0",
                                "isbinaryfile": "^3.0.3",
                                "js-yaml": "^3.12.0",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                "lazy-val": "^1.0.3",
                                "minimatch": "^3.0.4",
                                "normalize-package-data": "^2.4.0",
                                "plist": "^3.0.1",
+<<<<<<< HEAD
+                               "read-config-file": "3.2.1",
+=======
                                "read-config-file": "3.2.0",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                "sanitize-filename": "^1.6.1",
                                "semver": "^5.6.0",
                                "temp-file": "^3.3.2"
                        "dev": true
                },
                "builder-util": {
+<<<<<<< HEAD
+                       "version": "9.6.2",
+                       "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-9.6.2.tgz",
+                       "integrity": "sha512-cWl/0/Q851lesMmXp1IjreeAX1QAWA9e+iU2IT61oh+CvMYJnDwao2m9ZCHammdw2zllrwWu4fOC3gvsb/yOCw==",
+                       "dev": true,
+                       "requires": {
+                               "7zip-bin": "~4.1.0",
+                               "app-builder-bin": "2.6.3",
+                               "bluebird-lst": "^1.0.6",
+                               "builder-util-runtime": "^8.1.1",
+                               "chalk": "^2.4.2",
+                               "debug": "^4.1.1",
+                               "fs-extra-p": "^7.0.0",
+                               "is-ci": "^2.0.0",
+                               "js-yaml": "^3.12.1",
+                               "source-map-support": "^0.5.10",
+=======
                        "version": "9.6.1",
                        "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-9.6.1.tgz",
                        "integrity": "sha512-8MljKTjeV+A+LLVexuWEV3EpWbiUcsHHrB4Bg2qNo/3dC+vTo6g/27+W3Ij7Ij1UTobSkNBstFieWijXJCco9A==",
                                "is-ci": "^2.0.0",
                                "js-yaml": "^3.12.0",
                                "source-map-support": "^0.5.9",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                "stat-mode": "^0.2.2",
                                "temp-file": "^3.3.2"
                        },
                        }
                },
                "builder-util-runtime": {
+<<<<<<< HEAD
+                       "version": "8.1.1",
+                       "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.1.1.tgz",
+                       "integrity": "sha512-+ieS4PMB33vVE2S3ZNWBEQJ1zKmAs/agrBdh7XadE1lKLjrH4aXYuOh9OOGdxqIRldhlhNBaF+yKMMEFOdNVig==",
+                       "dev": true,
+                       "requires": {
+                               "bluebird-lst": "^1.0.6",
+                               "debug": "^4.1.1",
+=======
                        "version": "8.1.0",
                        "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.1.0.tgz",
                        "integrity": "sha512-s1mlJ28mv+56Iebh6c9aXjVe11O3Z0cDTwAGeB0PCcUzHA37fDxGgS8ZGoYNMZP+rBHj21d/od1wuYofTVLaQg==",
                        "requires": {
                                "bluebird-lst": "^1.0.6",
                                "debug": "^4.1.0",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                "fs-extra-p": "^7.0.0",
                                "sax": "^1.2.4"
                        },
                },
                "camelcase-keys": {
                        "version": "2.1.0",
+<<<<<<< HEAD
+                       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+=======
                        "resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
                        "dev": true,
                        "requires": {
                        "dev": true
                },
                "chalk": {
+<<<<<<< HEAD
+                       "version": "2.4.2",
+                       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+                       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+=======
                        "version": "2.4.1",
                        "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
                        "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "dev": true,
                        "requires": {
                                "ansi-styles": "^3.2.1",
                },
                "concat-stream": {
                        "version": "1.6.2",
+<<<<<<< HEAD
+                       "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+=======
                        "resolved": "http://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
                        "dev": true,
                        "requires": {
                                },
                                "readable-stream": {
                                        "version": "2.3.6",
+<<<<<<< HEAD
+                                       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+=======
                                        "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                        "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
                                        "dev": true,
                                        "requires": {
                                },
                                "string_decoder": {
                                        "version": "1.1.1",
+<<<<<<< HEAD
+                                       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+=======
                                        "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                        "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
                                        "dev": true,
                                        "requires": {
                        "dev": true
                },
                "dmg-builder": {
+<<<<<<< HEAD
+                       "version": "6.5.4",
+                       "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-6.5.4.tgz",
+                       "integrity": "sha512-EaEkF8weXez3iAwgYffjcYfumauUh5x+BggMgn/IuihNIA5/WfzRAUR4wMq9aII2zwArlw+rIrX6ZHKbmtkQmA==",
+                       "dev": true,
+                       "requires": {
+                               "app-builder-lib": "~20.38.5",
+                               "bluebird-lst": "^1.0.6",
+                               "builder-util": "~9.6.2",
+                               "fs-extra-p": "^7.0.0",
+                               "iconv-lite": "^0.4.24",
+                               "js-yaml": "^3.12.1",
+=======
                        "version": "6.5.3",
                        "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-6.5.3.tgz",
                        "integrity": "sha512-ZNl4GFBg6rdFplnuoK56iftxh/qgM7rXJUxgl21eK4WsjxgQwtQ0REZo+pDSL4OzVeyOO8MMNWSNQcCsBLiDyA==",
                                "fs-extra-p": "^7.0.0",
                                "iconv-lite": "^0.4.24",
                                "js-yaml": "^3.12.0",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                "parse-color": "^1.0.0",
                                "sanitize-filename": "^1.6.1"
                        }
                        "dev": true
                },
                "electron": {
+<<<<<<< HEAD
+                       "version": "3.0.10",
+                       "resolved": "https://registry.npmjs.org/electron/-/electron-3.0.10.tgz",
+                       "integrity": "sha512-I39IeQP3NOlbjKzTDK8uK2JdiHDfhV5SruCS2Gttkn2MaKCY+yIzQ6Wr4DyBXLeTEkL1sbZxbqQVhCavAliv5w==",
+=======
                        "version": "3.0.13",
                        "resolved": "https://registry.npmjs.org/electron/-/electron-3.0.13.tgz",
                        "integrity": "sha512-tfx5jFgXhCmpe6oPjcesaRj7geHqQxrJdbpseanRzL9BbyYUtsj0HoxwPAUvCx4+52P6XryBwWTvne/1eBVf9Q==",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "dev": true,
                        "requires": {
                                "@types/node": "^8.0.24",
                        }
                },
                "electron-builder": {
+<<<<<<< HEAD
+                       "version": "20.38.5",
+                       "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.38.5.tgz",
+                       "integrity": "sha512-p88IDHhH2J4hA6KwRBJY+OfVZuFtFIShY3Uh/TwYAfbX0v1RhKZytuGdO8sty2zcWxDYX74xDBv+X9oN6qEIRQ==",
+                       "dev": true,
+                       "requires": {
+                               "app-builder-lib": "20.38.5",
+                               "bluebird-lst": "^1.0.6",
+                               "builder-util": "9.6.2",
+                               "builder-util-runtime": "8.1.1",
+                               "chalk": "^2.4.2",
+                               "dmg-builder": "6.5.4",
+                               "fs-extra-p": "^7.0.0",
+                               "is-ci": "^2.0.0",
+                               "lazy-val": "^1.0.3",
+                               "read-config-file": "3.2.1",
+=======
                        "version": "20.38.4",
                        "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.38.4.tgz",
                        "integrity": "sha512-WHOr3Rz2wktxV5TqmRL6woO9/wrIZeRfJPSEXOhgfgLskE5Sp2Aer0zAF7lHNqXuG6JhU+0I9IYFAxa73MTs9w==",
                                "is-ci": "^2.0.0",
                                "lazy-val": "^1.0.3",
                                "read-config-file": "3.2.0",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                "sanitize-filename": "^1.6.1",
                                "update-notifier": "^2.5.0",
                                "yargs": "^12.0.5"
                                                "ms": "2.0.0"
                                        }
                                },
+<<<<<<< HEAD
+                               "isbinaryfile": {
+                                       "version": "3.0.3",
+                                       "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
+                                       "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
+                                       "dev": true,
+                                       "requires": {
+                                               "buffer-alloc": "^1.2.0"
+                                       }
+                               },
+=======
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                "ms": {
                                        "version": "2.0.0",
                                        "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
                        }
                },
                "electron-publish": {
+<<<<<<< HEAD
+                       "version": "20.38.5",
+                       "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.38.5.tgz",
+                       "integrity": "sha512-EhdPm6t0nKDfa0r3KjV1kSFcz03VrzgJRv7v5nHkkpQZB6OSmDNlHq7k66NBwQhPK3i4CK+uvehljZAP28vbCA==",
+                       "dev": true,
+                       "requires": {
+                               "bluebird-lst": "^1.0.6",
+                               "builder-util": "~9.6.2",
+                               "builder-util-runtime": "^8.1.1",
+                               "chalk": "^2.4.2",
+=======
                        "version": "20.38.3",
                        "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.38.3.tgz",
                        "integrity": "sha512-Qomq253NT5DfjUZgFSx6p+gheU5YhM6zZ67fTtBZvwyk0v8HwxNXfa8fZT7h+1c3BwEmjusTbmjZRNW/XZBXFA==",
                                "builder-util": "~9.6.0",
                                "builder-util-runtime": "^8.1.0",
                                "chalk": "^2.4.1",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                "fs-extra-p": "^7.0.0",
                                "lazy-val": "^1.0.3",
                                "mime": "^2.4.0"
                },
                "get-stream": {
                        "version": "3.0.0",
+<<<<<<< HEAD
+                       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+=======
                        "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
                        "dev": true
                },
                },
                "got": {
                        "version": "6.7.1",
+<<<<<<< HEAD
+                       "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
+=======
                        "resolved": "http://registry.npmjs.org/got/-/got-6.7.1.tgz",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
                        "dev": true,
                        "requires": {
                },
                "is-builtin-module": {
                        "version": "1.0.0",
+<<<<<<< HEAD
+                       "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+=======
                        "resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
                        "dev": true,
                        "requires": {
                },
                "is-obj": {
                        "version": "1.0.1",
+<<<<<<< HEAD
+                       "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+=======
                        "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
                        "dev": true
                },
                        "dev": true
                },
                "isbinaryfile": {
+<<<<<<< HEAD
+                       "version": "4.0.0",
+                       "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.0.tgz",
+                       "integrity": "sha512-RBtmso6l2mCaEsUvXngMTIjg3oheXo0MgYzzfT6sk44RYggPnm9fT+cQJAmzRnJIxPHXg9FZglqDJGW28dvcqA==",
+                       "dev": true
+=======
                        "version": "3.0.3",
                        "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
                        "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
                        "requires": {
                                "buffer-alloc": "^1.2.0"
                        }
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                },
                "isexe": {
                        "version": "2.0.0",
                        "dev": true
                },
                "js-yaml": {
+<<<<<<< HEAD
+                       "version": "3.12.1",
+                       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz",
+                       "integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==",
+=======
                        "version": "3.12.0",
                        "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
                        "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "dev": true,
                        "requires": {
                                "argparse": "^1.0.7",
                },
                "load-json-file": {
                        "version": "1.1.0",
+<<<<<<< HEAD
+                       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+=======
                        "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
                        "dev": true,
                        "requires": {
                },
                "meow": {
                        "version": "3.7.0",
+<<<<<<< HEAD
+                       "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+=======
                        "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
                        "dev": true,
                        "requires": {
                },
                "minimist": {
                        "version": "1.2.0",
+<<<<<<< HEAD
+                       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+=======
                        "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
                        "dev": true
                },
                "mkdirp": {
                        "version": "0.5.1",
+<<<<<<< HEAD
+                       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+=======
                        "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
                        "dev": true,
                        "requires": {
                        "dependencies": {
                                "minimist": {
                                        "version": "0.0.8",
+<<<<<<< HEAD
+                                       "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+=======
                                        "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                        "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
                                        "dev": true
                                }
                },
                "p-is-promise": {
                        "version": "1.1.0",
+<<<<<<< HEAD
+                       "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
+=======
                        "resolved": "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=",
                        "dev": true
                },
                        "dependencies": {
                                "color-convert": {
                                        "version": "0.5.3",
+<<<<<<< HEAD
+                                       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz",
+=======
                                        "resolved": "http://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                        "integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=",
                                        "dev": true
                                }
                },
                "pify": {
                        "version": "2.3.0",
+<<<<<<< HEAD
+                       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+=======
                        "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
                        "dev": true
                },
                },
                "pretty-bytes": {
                        "version": "1.0.4",
+<<<<<<< HEAD
+                       "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
+=======
                        "resolved": "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=",
                        "dev": true,
                        "requires": {
                        }
                },
                "read-config-file": {
+<<<<<<< HEAD
+                       "version": "3.2.1",
+                       "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-3.2.1.tgz",
+                       "integrity": "sha512-yW4hZZXdNN+Paij5JVAiTv1lUsAN5QRBU5NqotQqwYdVkUczSmDzm66VLu0eojiZt2zFeYptTFDAYlalDGuHdA==",
+                       "dev": true,
+                       "requires": {
+                               "ajv": "^6.7.0",
+                               "ajv-keywords": "^3.2.0",
+                               "bluebird-lst": "^1.0.6",
+                               "dotenv": "^6.2.0",
+                               "dotenv-expand": "^4.2.0",
+                               "fs-extra-p": "^7.0.0",
+                               "js-yaml": "^3.12.1",
+=======
                        "version": "3.2.0",
                        "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-3.2.0.tgz",
                        "integrity": "sha512-i1QRc5jy4sHm9YBGb6ArA5SU1mDrc5wu2mnm3r9gPnm+LVZhBGbpTCKqAXyvV4TJHnBR3Yaaww+9b3DyRZcfww==",
                                "dotenv-expand": "^4.2.0",
                                "fs-extra-p": "^7.0.0",
                                "js-yaml": "^3.12.0",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                "json5": "^2.1.0",
                                "lazy-val": "^1.0.3"
                        }
                },
                "readable-stream": {
                        "version": "1.1.14",
+<<<<<<< HEAD
+                       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+=======
                        "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
                        "dev": true,
                        "requires": {
                        "dev": true
                },
                "source-map-support": {
+<<<<<<< HEAD
+                       "version": "0.5.10",
+                       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz",
+                       "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==",
+=======
                        "version": "0.5.9",
                        "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.9.tgz",
                        "integrity": "sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "dev": true,
                        "requires": {
                                "buffer-from": "^1.0.0",
                },
                "sprintf-js": {
                        "version": "1.0.3",
+<<<<<<< HEAD
+                       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+=======
                        "resolved": "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
                        "dev": true
                },
                },
                "string-width": {
                        "version": "1.0.2",
+<<<<<<< HEAD
+                       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+=======
                        "resolved": "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
                        "dev": true,
                        "requires": {
                },
                "string_decoder": {
                        "version": "0.10.31",
+<<<<<<< HEAD
+                       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+=======
                        "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
                        "dev": true
                },
                "strip-ansi": {
                        "version": "3.0.1",
+<<<<<<< HEAD
+                       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+=======
                        "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
                        "dev": true,
                        "requires": {
                },
                "strip-eof": {
                        "version": "1.0.0",
+<<<<<<< HEAD
+                       "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+=======
                        "resolved": "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
                        "dev": true
                },
                },
                "through2": {
                        "version": "0.2.3",
+<<<<<<< HEAD
+                       "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
+=======
                        "resolved": "http://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
                        "dev": true,
                        "requires": {
                },
                "wrap-ansi": {
                        "version": "2.1.0",
+<<<<<<< HEAD
+                       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+=======
                        "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
                        "dev": true,
                        "requires": {
                },
                "xmlbuilder": {
                        "version": "9.0.7",
+<<<<<<< HEAD
+                       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
+=======
                        "resolved": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
+>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
                        "dev": true
                },