e7d3d047ec
* Revert "Revert "Merge from vscode merge-base (#22769)" (#22779)"
This reverts commit
|
||
---|---|---|
.. | ||
media | ||
src | ||
.eslintrc.json | ||
.vscodeignore | ||
README.md | ||
extension-browser.webpack.config.js | ||
extension.webpack.config.js | ||
package.json | ||
package.nls.json | ||
tsconfig.json | ||
yarn.lock |
README.md
Merge Conflict
Notice: This extension is bundled with Azure Data Studio. It can be disabled but not uninstalled.
Features
See Merge Conflicts to learn about features of this extension.