Skip to content

Commit 9e61540

Browse files
committed
fix: resolve conflicts in package.json
I hope this was done correctly. It upgraded a few packages, we left out the electron packages and it added two resolutions.
1 parent b952616 commit 9e61540

File tree

1 file changed

+2
-23
lines changed

1 file changed

+2
-23
lines changed

lib/vscode/package.json

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,10 @@
7575
"native-is-elevated": "0.4.1",
7676
"native-keymap": "2.2.1",
7777
"native-watchdog": "1.3.0",
78-
<<<<<<< HEAD
79-
"node-pty": "0.10.0-beta17",
78+
"node-pty": "0.10.0-beta19",
8079
"proxy-agent": "^4.0.0",
8180
"proxy-from-env": "^1.1.0",
8281
"rimraf": "^2.2.8",
83-
=======
84-
"node-pty": "0.10.0-beta19",
85-
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
8682
"spdlog": "^0.11.1",
8783
"sudo-prompt": "9.1.1",
8884
"tas-client-umd": "0.1.2",
@@ -113,16 +109,10 @@
113109
"@types/gulp-postcss": "^8.0.0",
114110
"@types/http-proxy-agent": "^2.0.1",
115111
"@types/keytar": "^4.4.0",
116-
<<<<<<< HEAD
117-
"@types/minimist": "^1.2.0",
118-
"@types/mocha": "2.2.39",
119-
"@types/node": "^12.11.7",
120112
"@types/proxy-from-env": "^1.0.1",
121-
=======
122113
"@types/minimist": "^1.2.1",
123114
"@types/mocha": "^8.2.0",
124115
"@types/node": "^12.19.9",
125-
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
126116
"@types/sinon": "^1.16.36",
127117
"@types/trusted-types": "^1.0.6",
128118
"@types/vscode-windows-registry": "^1.0.0",
@@ -144,11 +134,6 @@
144134
"cssnano": "^4.1.10",
145135
"debounce": "^1.0.0",
146136
"deemon": "^1.4.0",
147-
<<<<<<< HEAD
148-
=======
149-
"electron": "11.2.1",
150-
"electron-rebuild": "2.0.3",
151-
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
152137
"eslint": "6.8.0",
153138
"eslint-plugin-jsdoc": "^19.1.0",
154139
"event-stream": "3.3.4",
@@ -204,11 +189,8 @@
204189
"pump": "^1.0.1",
205190
"queue": "3.0.6",
206191
"rcedit": "^1.1.0",
207-
<<<<<<< HEAD
208-
=======
209192
"request": "^2.85.0",
210193
"rimraf": "^2.2.8",
211-
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
212194
"sinon": "^1.17.2",
213195
"source-map": "0.6.1",
214196
"source-map-support": "^0.3.2",
@@ -244,11 +226,8 @@
244226
"windows-process-tree": "0.2.4"
245227
},
246228
"resolutions": {
247-
<<<<<<< HEAD
248-
"minimist": "^1.2.5"
249-
=======
229+
"minimist": "^1.2.5",
250230
"elliptic": "^6.5.3",
251231
"nwmatcher": "^1.4.4"
252-
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
253232
}
254233
}

0 commit comments

Comments
 (0)