a
/
code-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: resolve conflicts in .eslintignore

This commit is contained in:
Joe Previte 2021-02-25 11:36:01 -07:00
parent c94697da98
commit 2c5c48525e
No known key found for this signature in database
GPG Key ID: 2C91590C6B742C24
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/vscode/.eslintignore
View File

@ -14,9 +14,6 @@
**/extensions/**/build/** **/extensions/**/build/**
**/extensions/markdown-language-features/media/** **/extensions/markdown-language-features/media/**
**/extensions/typescript-basics/test/colorize-fixtures/** **/extensions/typescript-basics/test/colorize-fixtures/**
<<<<<<< HEAD **/extensions/**/dist/**
# This is a code-server code symlink. # This is a code-server code symlink.
src/vs/base/node/proxy_agent.ts src/vs/base/node/proxy_agent.ts
=======
**/extensions/**/dist/**
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4