Merge remote-tracking branch 'origin/master'

2026-03-26 20:16:57 +11:00
parent 219223828a 6539e1b749
commit fd31faa2a5
2 changed files with 1 additions and 15 deletions
--- a/Seighell/.obsidian/plugins/obsidian-git/data.json
+++ b/Seighell/.obsidian/plugins/obsidian-git/data.json
@@ -17,7 +17,7 @@
  "showStatusBar": true,
  "updateSubmodules": false,
  "syncMethod": "merge",
-  "mergeStrategy": "none",
+  "mergeStrategy": "theirs",
  "customMessageOnAutoBackup": false,
  "autoBackupAfterFileChange": true,
  "treeStructure": false,
--- a/Seighell/.obsidian/plugins/obsidian-style-settings/data.json
+++ b/Seighell/.obsidian/plugins/obsidian-style-settings/data.json
@@ -1,14 +0,0 @@
-{
-  "ITS@@mini": false,
-  "ITS@@its-d": false,
-  "ITS@@accent-color": false,
-  "ITS@@notion": false,
-  "ITS@@canvas-cards": true,
-  "ITS@@select": "none",
-  "ITS@@nord": false,
-  "ITS@@drwn": true,
-  "ITS@@t-d": false,
-  "ITS@@s-d": false,
-  "ITS@@slrvb-g": false,
-  "ITS@@slrvb-b": false
-}