diff --git a/client/package-lock.json b/client/package-lock.json index bb94f51a1..158a85bee 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1355,12 +1355,10 @@ "react-router-dom": "^4.3.1" } }, -<<<<<<< HEAD -======= "@superalgos/strategizer-client": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/@superalgos/strategizer-client/-/strategizer-client-0.0.2.tgz", - "integrity": "sha512-c62Ug2fmRVgLTmKy0o6TNQBp7OOI5jkKu3QB0d1+H36oJCg/uDiWLvr17fGXmAWdSr4o8Y3I1dW9H7P9MubO0g==", + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/@superalgos/strategizer-client/-/strategizer-client-0.0.3.tgz", + "integrity": "sha512-i6y/wzKbhWyro6ikeA+NYRz9NOQRbBrVj5rZrsHZdGBHh08eIY/SRIgHJLgLl/FXAGv+E3k/b/Spt8VYfl02Cg==", "dev": true, "requires": { "@material-ui/core": "^3.2.0", @@ -1475,7 +1473,6 @@ } } }, ->>>>>>> develop "@superalgos/teams-client": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/@superalgos/teams-client/-/teams-client-0.0.33.tgz", @@ -20053,7 +20050,6 @@ "requires": { "ajv": "^6.1.0", "ajv-keywords": "^3.1.0" -<<<<<<< HEAD } }, "source-map": { @@ -20104,65 +20100,10 @@ "requires": { "ajv": "^6.1.0", "ajv-keywords": "^3.1.0" -======= ->>>>>>> develop - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, -<<<<<<< HEAD -======= - "webpack": { - "version": "4.19.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.19.1.tgz", - "integrity": "sha512-j7Q/5QqZRqIFXJvC0E59ipLV5Hf6lAnS3ezC3I4HMUybwEDikQBVad5d+IpPtmaQPQArvgUZLXIN6lWijHBn4g==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.7.6", - "@webassemblyjs/helper-module-context": "1.7.6", - "@webassemblyjs/wasm-edit": "1.7.6", - "@webassemblyjs/wasm-parser": "1.7.6", - "acorn": "^5.6.2", - "acorn-dynamic-import": "^3.0.0", - "ajv": "^6.1.0", - "ajv-keywords": "^3.1.0", - "chrome-trace-event": "^1.0.0", - "enhanced-resolve": "^4.1.0", - "eslint-scope": "^4.0.0", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.3.0", - "loader-utils": "^1.1.0", - "memory-fs": "~0.4.1", - "micromatch": "^3.1.8", - "mkdirp": "~0.5.0", - "neo-async": "^2.5.0", - "node-libs-browser": "^2.0.0", - "schema-utils": "^0.4.4", - "tapable": "^1.1.0", - "uglifyjs-webpack-plugin": "^1.2.4", - "watchpack": "^1.5.0", - "webpack-sources": "^1.2.0" - }, - "dependencies": { - "schema-utils": { - "version": "0.4.7", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz", - "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==", - "dev": true, - "requires": { - "ajv": "^6.1.0", - "ajv-keywords": "^3.1.0" } } } }, ->>>>>>> develop "yallist": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", @@ -22951,8 +22892,6 @@ "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==", "dev": true }, -<<<<<<< HEAD -======= "ts-invariant": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.2.1.tgz", @@ -22962,7 +22901,6 @@ "tslib": "^1.9.3" } }, ->>>>>>> develop "tslib": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", diff --git a/client/package.json b/client/package.json index bab074396..ad830fa25 100644 --- a/client/package.json +++ b/client/package.json @@ -36,7 +36,7 @@ "@superalgos/key-vault-client": "0.0.31", "@superalgos/logs-client": "0.0.1", "@superalgos/operations-client": "0.0.20", - "@superalgos/strategizer-client": "0.0.2", + "@superalgos/strategizer-client": "0.0.3", "@superalgos/teams-client": "0.0.33", "@superalgos/users-client": "0.0.25", "@superalgos/web-components": "0.0.18",