刘冰洁 1 year ago
parent
commit
91372d3b6c
1 changed files with 0 additions and 4 deletions
  1. 0 4
      .vscode/settings.json

+ 0 - 4
.vscode/settings.json

@@ -43,11 +43,7 @@
   "terminal.integrated.fontWeight": 500,
   "terminal.integrated.tabs.enabled": true,
   "workbench.iconTheme": "material-icon-theme",
-<<<<<<< HEAD
   "workbench.colorTheme": "蓝色空间——浅色🌷",
-=======
-  "workbench.colorTheme": "Default Light Modern",
->>>>>>> e655156db19c1cc943d461cfb76a471eabc7b982
   "[html]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },