open.source/manifold
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
Milli 2022-06-03 19:06:23 +02:00
parent b1532f766a
commit 1ce8276013
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.vscode/settings.json vendored
View File

@ -2,8 +2,6 @@
"javascript.preferences.importModuleSpecifier": "shortest", "javascript.preferences.importModuleSpecifier": "shortest",
"typescript.preferences.importModuleSpecifier": "shortest", "typescript.preferences.importModuleSpecifier": "shortest",
"files.eol": "\r\n", "files.eol": "\r\n",
<<<<<<< HEAD
=======
"search.exclude": { "search.exclude": {
"**/node_modules": true, "**/node_modules": true,
"**/package-lock.json": true, "**/package-lock.json": true,
@ -12,5 +10,4 @@
"editor.formatOnSave": true, "editor.formatOnSave": true,
"editor.formatOnPaste": true, "editor.formatOnPaste": true,
"editor.defaultFormatter": "esbenp.prettier-vscode" "editor.defaultFormatter": "esbenp.prettier-vscode"
>>>>>>> vscode_files
} }