vault backup: 2026-08-03 09:02:51

2026-08-03 09:02:51 +02:00
1 changed files with 1 additions and 1 deletions
--- a/.obsidian/plugins/obsidian-git/data.json
+++ b/.obsidian/plugins/obsidian-git/data.json
@@ -17,7 +17,7 @@
  "showStatusBar": true,
  "updateSubmodules": false,
  "syncMethod": "merge",
-  "mergeStrategy": "none",
+  "mergeStrategy": "theirs",
  "customMessageOnAutoBackup": false,
  "autoBackupAfterFileChange": false,
  "treeStructure": false,