|
75 | 75 | "native-is-elevated": "0.4.1",
|
76 | 76 | "native-keymap": "2.2.1",
|
77 | 77 | "native-watchdog": "1.3.0",
|
78 |
| -<<<<<<< HEAD |
79 |
| - "node-pty": "0.10.0-beta17", |
| 78 | + "node-pty": "0.10.0-beta19", |
80 | 79 | "proxy-agent": "^4.0.0",
|
81 | 80 | "proxy-from-env": "^1.1.0",
|
82 | 81 | "rimraf": "^2.2.8",
|
83 |
| -======= |
84 |
| - "node-pty": "0.10.0-beta19", |
85 |
| ->>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4 |
86 | 82 | "spdlog": "^0.11.1",
|
87 | 83 | "sudo-prompt": "9.1.1",
|
88 | 84 | "tas-client-umd": "0.1.2",
|
|
113 | 109 | "@types/gulp-postcss": "^8.0.0",
|
114 | 110 | "@types/http-proxy-agent": "^2.0.1",
|
115 | 111 | "@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", |
120 | 112 | "@types/proxy-from-env": "^1.0.1",
|
121 |
| -======= |
122 | 113 | "@types/minimist": "^1.2.1",
|
123 | 114 | "@types/mocha": "^8.2.0",
|
124 | 115 | "@types/node": "^12.19.9",
|
125 |
| ->>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4 |
126 | 116 | "@types/sinon": "^1.16.36",
|
127 | 117 | "@types/trusted-types": "^1.0.6",
|
128 | 118 | "@types/vscode-windows-registry": "^1.0.0",
|
|
144 | 134 | "cssnano": "^4.1.10",
|
145 | 135 | "debounce": "^1.0.0",
|
146 | 136 | "deemon": "^1.4.0",
|
147 |
| -<<<<<<< HEAD |
148 |
| -======= |
149 |
| - "electron": "11.2.1", |
150 |
| - "electron-rebuild": "2.0.3", |
151 |
| ->>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4 |
152 | 137 | "eslint": "6.8.0",
|
153 | 138 | "eslint-plugin-jsdoc": "^19.1.0",
|
154 | 139 | "event-stream": "3.3.4",
|
|
204 | 189 | "pump": "^1.0.1",
|
205 | 190 | "queue": "3.0.6",
|
206 | 191 | "rcedit": "^1.1.0",
|
207 |
| -<<<<<<< HEAD |
208 |
| -======= |
209 | 192 | "request": "^2.85.0",
|
210 | 193 | "rimraf": "^2.2.8",
|
211 |
| ->>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4 |
212 | 194 | "sinon": "^1.17.2",
|
213 | 195 | "source-map": "0.6.1",
|
214 | 196 | "source-map-support": "^0.3.2",
|
|
244 | 226 | "windows-process-tree": "0.2.4"
|
245 | 227 | },
|
246 | 228 | "resolutions": {
|
247 |
| -<<<<<<< HEAD |
248 |
| - "minimist": "^1.2.5" |
249 |
| -======= |
| 229 | + "minimist": "^1.2.5", |
250 | 230 | "elliptic": "^6.5.3",
|
251 | 231 | "nwmatcher": "^1.4.4"
|
252 |
| ->>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4 |
253 | 232 | }
|
254 | 233 | }
|
0 commit comments