azuredatastudio/extensions/merge-conflict
Karl Burtram e7d3d047ec
Merge from vscode merge-base (#22780)
* Revert "Revert "Merge from vscode merge-base (#22769)" (#22779)"

This reverts commit 47a1745180.

* Fix notebook download task

* Remove done call from extensions-ci
2023-04-19 21:48:46 -07:00
..
media Merge from vscode a348d103d1 (#15681) 2021-06-17 08:17:11 -07:00
src Merge from vscode merge-base (#22780) 2023-04-19 21:48:46 -07:00
.eslintrc.json Remove unnecessary awaits from extensions (#19571) 2022-05-31 15:36:44 -07:00
.vscodeignore Merge from vscode cfbd199976 2020-08-06 07:08:52 +00:00
README.md Merge Azure Data Studio branding changes (#2689) 2018-09-24 15:39:19 -07:00
extension-browser.webpack.config.js Merge from vscode 2cd495805c 2020-06-30 11:31:11 -07:00
extension.webpack.config.js Merge from vscode 4d91d96e5e 2020-06-19 10:59:23 -07:00
package.json Merge from vscode merge-base (#22780) 2023-04-19 21:48:46 -07:00
package.nls.json Merge from vscode 10492ba146 2020-04-08 06:33:38 +00:00
tsconfig.json Merge vscode 1.67 (#20883) 2022-10-19 19:13:18 -07:00
yarn.lock Merge vscode 1.67 (#20883) 2022-10-19 19:13:18 -07:00

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.