vault backup: 2025-03-07 22:32:33

2025-03-07 22:32:33 +08:00
parent 657dd8a624 7687d5198d
commit 16d9a075b5
12 changed files with 268 additions and 11 deletions
--- a/.obsidian/app.json
+++ b/.obsidian/app.json
@ -5,5 +5,10 @@
  "strictLineBreaks": true,
  "useMarkdownLinks": true,
  "showLineNumber": false,
+<<<<<<< HEAD
  "trashOption": "local"
+=======
+  "trashOption": "local",
+  "alwaysUpdateLinks": true
+>>>>>>> origin/main
 }