diff options
| -rw-r--r-- | package-lock.json | 63 | ||||
| -rw-r--r-- | package.json | 7 |
2 files changed, 1 insertions, 69 deletions
diff --git a/package-lock.json b/package-lock.json index bcf0064..6478f3e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4263,7 +4263,6 @@ "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz", "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==", "requires": { -<<<<<<< HEAD "abab": "2.0.1", "whatwg-mimetype": "2.3.0", "whatwg-url": "7.0.0" @@ -4280,11 +4279,6 @@ "webidl-conversions": "4.0.2" } } -======= - "abab": "^2.0.0", - "whatwg-mimetype": "^2.2.0", - "whatwg-url": "^7.0.0" ->>>>>>> origin/develop } }, "date-now": { @@ -6501,14 +6495,6 @@ "integrity": "sha512-Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA==", "dev": true, "requires": { -<<<<<<< HEAD - "@jest/environment": "24.9.0", - "@jest/fake-timers": "24.9.0", - "@jest/types": "24.9.0", - "jest-mock": "24.9.0", - "jest-util": "24.9.0", - "jsdom": "11.12.0" -======= "@jest/environment": "^24.9.0", "@jest/fake-timers": "^24.9.0", "@jest/types": "^24.9.0", @@ -6593,7 +6579,6 @@ "async-limiter": "~1.0.0" } } ->>>>>>> origin/develop } }, "jest-environment-node": { @@ -7545,7 +7530,6 @@ "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-15.1.1.tgz", "integrity": "sha512-cQZRBB33arrDAeCrAEWn1U3SvrvC8XysBua9Oqg1yWrsY/gYcusloJC3RZJXuY5eehSCmws8f2YeliCqGSkrtQ==", "requires": { -<<<<<<< HEAD "abab": "2.0.1", "acorn": "5.7.3", "acorn-globals": "4.3.3", @@ -7572,34 +7556,6 @@ "whatwg-url": "6.5.0", "ws": "5.2.2", "xml-name-validator": "3.0.0" -======= - "abab": "^2.0.0", - "acorn": "^6.1.1", - "acorn-globals": "^4.3.2", - "array-equal": "^1.0.0", - "cssom": "^0.3.6", - "cssstyle": "^1.2.2", - "data-urls": "^1.1.0", - "domexception": "^1.0.1", - "escodegen": "^1.11.1", - "html-encoding-sniffer": "^1.0.2", - "nwsapi": "^2.1.4", - "parse5": "5.1.0", - "pn": "^1.1.0", - "request": "^2.88.0", - "request-promise-native": "^1.0.7", - "saxes": "^3.1.9", - "symbol-tree": "^3.2.2", - "tough-cookie": "^3.0.1", - "w3c-hr-time": "^1.0.1", - "w3c-xmlserializer": "^1.1.2", - "webidl-conversions": "^4.0.2", - "whatwg-encoding": "^1.0.5", - "whatwg-mimetype": "^2.3.0", - "whatwg-url": "^7.0.0", - "ws": "^7.0.0", - "xml-name-validator": "^3.0.0" ->>>>>>> origin/develop }, "dependencies": { "ws": { @@ -7607,11 +7563,7 @@ "resolved": "https://registry.npmjs.org/ws/-/ws-7.1.2.tgz", "integrity": "sha512-gftXq3XI81cJCgkUiAVixA0raD9IVmXqsylCrjRygw4+UOOGzPoxnQ6r/CnVL9i+mDncJo94tSkyrtuuQVBmrg==", "requires": { -<<<<<<< HEAD - "async-limiter": "1.0.1" -======= "async-limiter": "^1.0.0" ->>>>>>> origin/develop } } } @@ -10214,13 +10166,8 @@ "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-3.1.0.tgz", "integrity": "sha512-lzUVMuJ06HF4rYveaz9Tv0WRlUMxJ0Y1hgSkkgg+50iEdaI0TthyEDe08KIHb0XsF6rn8WYTqPCaGTZg3sX+qA==", "requires": { -<<<<<<< HEAD "loader-utils": "1.2.3", "schema-utils": "2.1.0" -======= - "loader-utils": "^1.1.0", - "schema-utils": "^2.0.1" ->>>>>>> origin/develop } }, "react-is": { @@ -10494,10 +10441,6 @@ "integrity": "sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==", "requires": { "request-promise-core": "1.1.2", -<<<<<<< HEAD - "stealthy-require": "1.1.1", - "tough-cookie": "2.5.0" -======= "stealthy-require": "^1.1.1", "tough-cookie": "^2.3.3" }, @@ -10511,7 +10454,6 @@ "punycode": "^2.1.1" } } ->>>>>>> origin/develop } }, "require-directory": { @@ -11651,14 +11593,9 @@ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz", "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==", "requires": { -<<<<<<< HEAD - "psl": "1.3.0", - "punycode": "2.1.1" -======= "ip-regex": "^2.1.0", "psl": "^1.1.28", "punycode": "^2.1.1" ->>>>>>> origin/develop } }, "tr46": { diff --git a/package.json b/package.json index 4776e69..f315b62 100644 --- a/package.json +++ b/package.json @@ -14,12 +14,8 @@ }, "dependencies": { "@nuxtjs/axios": "^5.3.6", -<<<<<<< HEAD - "@nuxtjs/markdownit": "^1.2.7", - "@nuxtjs/pwa": "^3.0.0-0", - "nuxt": "^2.0.0" -======= "@nuxtjs/pwa": "^3.0.0-0", + "@nuxtjs/markdownit": "^1.2.7", "esm": "^3.2.25", "front-matter": "^3.0.2", "jsdom": "^15.1.1", @@ -27,7 +23,6 @@ "markdown-it": "^10.0.0", "nuxt": "^2.0.0", "raw-loader": "^3.1.0" ->>>>>>> origin/develop }, "devDependencies": { "@vue/test-utils": "^1.0.0-beta.27", |