cubetiq/code-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
be3e823608
code-server/extensions/merge-conflict
History
Joe Previte be3e823608 Squashed 'lib/vscode/' content from commit e5a624b788 
git-subtree-dir: lib/vscode
git-subtree-split: e5a624b788d92b8d34d1392e4c4d9789406efe8f
2020-12-15 15:52:33 -07:00
..
resources/icons Squashed 'lib/vscode/' content from commit e5a624b788 2020-12-15 15:52:33 -07:00
src Squashed 'lib/vscode/' content from commit e5a624b788 2020-12-15 15:52:33 -07:00
.vscodeignore Squashed 'lib/vscode/' content from commit e5a624b788 2020-12-15 15:52:33 -07:00
extension-browser.webpack.config.js Squashed 'lib/vscode/' content from commit e5a624b788 2020-12-15 15:52:33 -07:00
extension.webpack.config.js Squashed 'lib/vscode/' content from commit e5a624b788 2020-12-15 15:52:33 -07:00
package.json Squashed 'lib/vscode/' content from commit e5a624b788 2020-12-15 15:52:33 -07:00
package.nls.json Squashed 'lib/vscode/' content from commit e5a624b788 2020-12-15 15:52:33 -07:00
README.md Squashed 'lib/vscode/' content from commit e5a624b788 2020-12-15 15:52:33 -07:00
tsconfig.json Squashed 'lib/vscode/' content from commit e5a624b788 2020-12-15 15:52:33 -07:00
yarn.lock Squashed 'lib/vscode/' content from commit e5a624b788 2020-12-15 15:52:33 -07: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.