|
68 | 68 | "http-proxy-agent": "^2.1.0",
|
69 | 69 | "https-proxy-agent": "^2.2.3",
|
70 | 70 | "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 |
| -======= |
82 | 71 | "jschardet": "2.3.0",
|
83 |
| - "keytar": "7.2.0", |
84 | 72 | "minimist": "^1.2.5",
|
85 | 73 | "native-is-elevated": "0.4.3",
|
86 |
| - "native-keymap": "2.2.1", |
87 | 74 | "native-watchdog": "1.3.0",
|
88 | 75 | "node-pty": "0.10.1",
|
| 76 | + "proxy-agent": "^4.0.0", |
| 77 | + "proxy-from-env": "^1.1.0", |
89 | 78 | "nsfw": "2.1.2",
|
90 |
| ->>>>>>> 58ce849223667f77dc0d6d7658870ca3f815e17f |
91 | 79 | "spdlog": "^0.11.1",
|
92 | 80 | "sudo-prompt": "9.2.1",
|
93 | 81 | "tas-client-umd": "0.1.4",
|
|
118 | 106 | "@types/http-proxy-agent": "^2.0.1",
|
119 | 107 | "@types/minimist": "^1.2.1",
|
120 | 108 | "@types/mocha": "^8.2.0",
|
121 |
| -<<<<<<< HEAD |
122 |
| - "@types/node": "^12.19.9", |
123 |
| - "@types/proxy-from-env": "^1.0.1", |
124 |
| -======= |
125 | 109 | "@types/node": "^14.14.37",
|
126 |
| ->>>>>>> 58ce849223667f77dc0d6d7658870ca3f815e17f |
| 110 | + "@types/proxy-from-env": "^1.0.1", |
127 | 111 | "@types/sinon": "^1.16.36",
|
128 | 112 | "@types/trusted-types": "^1.0.6",
|
129 | 113 | "@types/vscode-windows-registry": "^1.0.0",
|
|
146 | 130 | "cssnano": "^4.1.11",
|
147 | 131 | "debounce": "^1.0.0",
|
148 | 132 | "deemon": "^1.4.0",
|
149 |
| -<<<<<<< HEAD |
150 |
| -======= |
151 |
| - "electron": "12.0.4", |
152 |
| ->>>>>>> 58ce849223667f77dc0d6d7658870ca3f815e17f |
153 | 133 | "eslint": "6.8.0",
|
154 | 134 | "eslint-plugin-jsdoc": "^19.1.0",
|
155 | 135 | "event-stream": "3.3.4",
|
|
0 commit comments