bughz
/
code-server
mirror of https://github.com/coder/code-server.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: resolve conflicts in .gitignore

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

23
lib/vscode/.gitignore vendored
View File

@ -5,32 +5,9 @@ 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/