Skip to content

Commit 52d2f1e

Browse files
author
Akash Satheesan
committed
fix(lib/vscode): fix conflicts in package.json
1 parent ec8894d commit 52d2f1e

File tree

2 files changed

+3
-29
lines changed

2 files changed

+3
-29
lines changed

lib/vscode/package.json

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -68,26 +68,14 @@
6868
"http-proxy-agent": "^2.1.0",
6969
"https-proxy-agent": "^2.2.3",
7070
"iconv-lite-umd": "0.6.8",
71-
<<<<<<< HEAD
72-
"jschardet": "2.2.1",
73-
"minimist": "^1.2.5",
74-
"native-is-elevated": "0.4.1",
75-
"native-watchdog": "1.3.0",
76-
"node-pty": "0.10.0-beta19",
77-
"proxy-agent": "^4.0.0",
78-
"proxy-from-env": "^1.1.0",
79-
"rimraf": "^2.2.8",
80-
"nsfw": "^2.1.1",
81-
=======
8271
"jschardet": "2.3.0",
83-
"keytar": "7.2.0",
8472
"minimist": "^1.2.5",
8573
"native-is-elevated": "0.4.3",
86-
"native-keymap": "2.2.1",
8774
"native-watchdog": "1.3.0",
8875
"node-pty": "0.10.1",
76+
"proxy-agent": "^4.0.0",
77+
"proxy-from-env": "^1.1.0",
8978
"nsfw": "2.1.2",
90-
>>>>>>> 58ce849223667f77dc0d6d7658870ca3f815e17f
9179
"spdlog": "^0.11.1",
9280
"sudo-prompt": "9.2.1",
9381
"tas-client-umd": "0.1.4",
@@ -118,12 +106,8 @@
118106
"@types/http-proxy-agent": "^2.0.1",
119107
"@types/minimist": "^1.2.1",
120108
"@types/mocha": "^8.2.0",
121-
<<<<<<< HEAD
122-
"@types/node": "^12.19.9",
123-
"@types/proxy-from-env": "^1.0.1",
124-
=======
125109
"@types/node": "^14.14.37",
126-
>>>>>>> 58ce849223667f77dc0d6d7658870ca3f815e17f
110+
"@types/proxy-from-env": "^1.0.1",
127111
"@types/sinon": "^1.16.36",
128112
"@types/trusted-types": "^1.0.6",
129113
"@types/vscode-windows-registry": "^1.0.0",
@@ -146,10 +130,6 @@
146130
"cssnano": "^4.1.11",
147131
"debounce": "^1.0.0",
148132
"deemon": "^1.4.0",
149-
<<<<<<< HEAD
150-
=======
151-
"electron": "12.0.4",
152-
>>>>>>> 58ce849223667f77dc0d6d7658870ca3f815e17f
153133
"eslint": "6.8.0",
154134
"eslint-plugin-jsdoc": "^19.1.0",
155135
"event-stream": "3.3.4",

lib/vscode/test/smoke/package.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,8 @@
1717
"@types/ncp": "2.0.1",
1818
"@types/node": "^12.19.9",
1919
"@types/rimraf": "^2.0.4",
20-
<<<<<<< HEAD
21-
"cpx": "^1.5.0",
22-
"htmlparser2": "^3.9.3",
23-
"mkdirp": "^0.5.1",
24-
=======
2520
"htmlparser2": "^3.9.2",
2621
"mkdirp": "^1.0.4",
27-
>>>>>>> 58ce849223667f77dc0d6d7658870ca3f815e17f
2822
"ncp": "^2.0.0",
2923
"npm-run-all": "^4.1.5",
3024
"portastic": "^1.0.1",

0 commit comments

Comments
 (0)