vscode/extensions/merge-conflict
Robo 9494a89080
chore: add npmrc to extensions folder (#230214)
2024-10-01 12:43:01 +02:00
..
media
src
.npmrc
.vscodeignore
README.md
extension-browser.webpack.config.js
extension.webpack.config.js
package-lock.json
package.json
package.nls.json
tsconfig.json

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.