History

chriswang521 abcce6b843 升级x86 electron-25.8.4,node-18.15.0,node-pty-1.1.0-beta1等相关文件.		2023-11-14 16:23:33 +08:00
..
media	from 1.68.0	2022-06-14 14:37:10 +08:00
src	from 1.68.0	2022-06-14 14:37:10 +08:00
.vscodeignore	from 1.68.0	2022-06-14 14:37:10 +08:00
README.md	from 1.68.0	2022-06-14 14:37:10 +08:00
extension-browser.webpack.config.js	from 1.68.0	2022-06-14 14:37:10 +08:00
extension.webpack.config.js	from 1.68.0	2022-06-14 14:37:10 +08:00
package.json	升级x86 electron-25.8.4,node-18.15.0,node-pty-1.1.0-beta1等相关文件.	2023-11-14 16:23:33 +08:00
package.nls.json	from 1.68.0	2022-06-14 14:37:10 +08:00
tsconfig.json	from 1.68.0	2022-06-14 14:37:10 +08:00
yarn.lock	升级x86 electron-25.8.4,node-18.15.0,node-pty-1.1.0-beta1等相关文件.	2023-11-14 16:23:33 +08:00

README.md

Merge Conflict

Notice: This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.

Features

See Merge Conflicts in VS Code to learn about features of this extension.