diff --git a/package-lock.json b/package-lock.json index 16a2b40..9daa7c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "bc-vscode-words", - "version": "1.3.2", + "version": "1.3.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "bc-vscode-words", - "version": "1.3.2", + "version": "1.3.3", "license": "BSD-3-Clause", "dependencies": { "vscode-languageserver": "^7.0.0", @@ -1346,15 +1346,9 @@ "dev": true }, "@types/node": { -<<<<<<< HEAD "version": "16.9.4", "resolved": "https://registry.npmjs.org/@types/node/-/node-16.9.4.tgz", "integrity": "sha512-KDazLNYAGIuJugdbULwFZULF9qQ13yNWEBFnfVpqlpgAAo6H/qnM9RjBgh0A0kmHf3XxAKLdN5mTIng9iUvVLA==", -======= - "version": "16.7.10", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.10.tgz", - "integrity": "sha512-S63Dlv4zIPb8x6MMTgDq5WWRJQe56iBEY0O3SOFA9JrRienkOVDXSXBjjJw6HTNQYSE2JI6GMCR6LVbIMHJVvA==", ->>>>>>> 4ab6d05c4f15bc795965aca59465275bceaf83b8 "dev": true }, "@ungap/promise-all-settled": { @@ -2031,15 +2025,9 @@ } }, "typescript": { -<<<<<<< HEAD "version": "4.4.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz", "integrity": "sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==", -======= - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.2.tgz", - "integrity": "sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ==", ->>>>>>> 4ab6d05c4f15bc795965aca59465275bceaf83b8 "dev": true }, "vscode-jsonrpc": {