mirror of
https://git.tuxpa.in/a/code-server.git
synced 2024-12-26 20:25:25 +00:00
eae5d8c807
These conflicts will be resolved in the following commits. We do it this way so that PR review is possible.
42 lines
651 B
Plaintext
42 lines
651 B
Plaintext
.DS_Store
|
|
.cache
|
|
npm-debug.log
|
|
Thumbs.db
|
|
node_modules/
|
|
.build/
|
|
extensions/**/dist/
|
|
<<<<<<< HEAD
|
|
out/
|
|
out-build/
|
|
out-editor/
|
|
out-editor-src/
|
|
out-editor-build/
|
|
out-editor-esm/
|
|
out-editor-esm-bundle/
|
|
out-editor-min/
|
|
out-monaco-editor-core/
|
|
out-vscode/
|
|
out-vscode-min/
|
|
out-vscode-reh/
|
|
out-vscode-reh-min/
|
|
out-vscode-reh-pkg/
|
|
out-vscode-reh-web/
|
|
out-vscode-reh-web-min/
|
|
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/
|
|
test_data/
|
|
test-results/
|
|
yarn-error.log
|
|
vscode.lsif
|
|
vscode.db
|