From e012082cb3c91af96619f0f982d5f2e8b4b705af Mon Sep 17 00:00:00 2001
From: wxx <1321839169@qq.com>
Date: 星期三, 30 十月 2024 15:07:26 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025

---
 Server/马丽萍/code/log/.vscode/settings.json |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git "a/Server/\351\251\254\344\270\275\350\220\215/code/log/.vscode/settings.json" "b/Server/\351\251\254\344\270\275\350\220\215/code/log/.vscode/settings.json"
index c9e66f1..cdd5402 100644
--- "a/Server/\351\251\254\344\270\275\350\220\215/code/log/.vscode/settings.json"
+++ "b/Server/\351\251\254\344\270\275\350\220\215/code/log/.vscode/settings.json"
@@ -55,5 +55,9 @@
   "C_Cpp_Runner.useLeakSanitizer": false,
   "C_Cpp_Runner.showCompilationTime": false,
   "C_Cpp_Runner.useLinkTimeOptimization": false,
-  "C_Cpp_Runner.msvcSecureNoWarnings": false
+  "C_Cpp_Runner.msvcSecureNoWarnings": false,
+  "files.associations": {
+    "iosfwd": "cpp",
+    "thread": "cpp"
+  }
 }
\ No newline at end of file

--
Gitblit v1.8.0