History

Matt Bierner 50cc1d0e97 Update to use TS 4.1 for building VS Code		2020-09-16 11:58:01 -07:00
..
resources/icons
src	Update to use TS 4.1 for building VS Code	2020-09-16 11:58:01 -07:00
.vscodeignore	Do not ship unnecessary files with extensions	2020-07-24 13:57:51 +02:00
extension-browser.webpack.config.js	used shared webpack-config for browser	2020-06-25 23:22:02 +02:00
extension.webpack.config.js
package.json	fix merge-conflict browser main	2020-06-26 11:14:23 +02:00
package.nls.json
README.md
tsconfig.json
yarn.lock

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.