fix: resolve conflicts in .eslintignore
This commit is contained in:
parent
c94697da98
commit
2c5c48525e
@ -14,9 +14,6 @@
|
||||
**/extensions/**/build/**
|
||||
**/extensions/markdown-language-features/media/**
|
||||
**/extensions/typescript-basics/test/colorize-fixtures/**
|
||||
<<<<<<< HEAD
|
||||
**/extensions/**/dist/**
|
||||
# This is a code-server code symlink.
|
||||
src/vs/base/node/proxy_agent.ts
|
||||
=======
|
||||
**/extensions/**/dist/**
|
||||
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
|
||||
|
Reference in New Issue
Block a user