From 8d46925b6d1f9b598a359ff34c6b8c05aadc7985 Mon Sep 17 00:00:00 2001
From: windyboy <windyboy@gmail.com>
Date: Fri, 9 Jan 2026 10:07:40 +0800
Subject: [PATCH] Merge remote changes and resolve conflicts

---
 .claude/settings.json | 4 ++--
 .obsidian/graph.json  | 2 +-
 新路径/新文件名.md    | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 新路径/新文件名.md

diff --git a/.claude/settings.json b/.claude/settings.json
index 1946cc2..62978a4 100644
--- a/.claude/settings.json
+++ b/.claude/settings.json
@@ -38,10 +38,10 @@
       "Remove-Partition"
     ]
   },
-  "model": "sonnet",
+  "model": "haiku",
   "enableAutoTitleGeneration": true,
   "titleGenerationModel": "",
-  "thinkingBudget": "low",
+  "thinkingBudget": "off",
   "permissionMode": "normal",
   "lastNonPlanPermissionMode": "normal",
   "permissions": [
diff --git a/.obsidian/graph.json b/.obsidian/graph.json
index e21a18d..42a46ec 100644
--- a/.obsidian/graph.json
+++ b/.obsidian/graph.json
@@ -18,5 +18,5 @@
   "linkStrength": 1,
   "linkDistance": 250,
   "scale": 1,
-  "close": false
+  "close": true
 }
\ No newline at end of file
diff --git a/新路径/新文件名.md b/新路径/新文件名.md
new file mode 100644
index 0000000..54c3df6
--- /dev/null
+++ b/新路径/新文件名.md
@@ -0,0 +1 @@
+模板名
\ No newline at end of file