Archived
1
0

chore(vscode): update to 1.53.2

These conflicts will be resolved in the following commits. We do it this way so
that PR review is possible.
This commit is contained in:
Joe Previte
2021-02-25 11:27:27 -07:00
1900 changed files with 83066 additions and 64589 deletions

View File

@ -5,6 +5,7 @@ Thumbs.db
node_modules/
.build/
extensions/**/dist/
<<<<<<< HEAD
out/
out-build/
out-editor/
@ -25,6 +26,11 @@ out-vscode-reh-web-pkg/
out-vscode-web/
out-vscode-web-min/
out-vscode-web-pkg/
=======
/out*/
/extensions/**/out/
src/vs/server
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
resources/server
build/node_modules
coverage/