eae5d8c807
These conflicts will be resolved in the following commits. We do it this way so that PR review is possible.
23 lines
552 B
Plaintext
23 lines
552 B
Plaintext
**/vs/nls.build.js
|
|
**/vs/nls.js
|
|
**/vs/css.build.js
|
|
**/vs/css.js
|
|
**/vs/loader.js
|
|
**/insane/**
|
|
**/marked/**
|
|
**/semver/**
|
|
**/test/**/*.js
|
|
**/node_modules/**
|
|
**/vscode-api-tests/testWorkspace/**
|
|
**/vscode-api-tests/testWorkspace2/**
|
|
**/extensions/**/out/**
|
|
**/extensions/**/build/**
|
|
**/extensions/markdown-language-features/media/**
|
|
**/extensions/typescript-basics/test/colorize-fixtures/**
|
|
<<<<<<< HEAD
|
|
# This is a code-server code symlink.
|
|
src/vs/base/node/proxy_agent.ts
|
|
=======
|
|
**/extensions/**/dist/**
|
|
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
|