Skip to content

Commit eae5d8c

Browse files
committed
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.
2 parents db3a13b + 89b6e01 commit eae5d8c

File tree

1,900 files changed

+82829
-64352
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,900 files changed

+82829
-64352
lines changed

lib/vscode/.eslintignore

+4
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,9 @@
1414
**/extensions/**/build/**
1515
**/extensions/markdown-language-features/media/**
1616
**/extensions/typescript-basics/test/colorize-fixtures/**
17+
<<<<<<< HEAD
1718
# This is a code-server code symlink.
1819
src/vs/base/node/proxy_agent.ts
20+
=======
21+
**/extensions/**/dist/**
22+
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4

0 commit comments

Comments
 (0)