Merge remote-tracking branch 'origin/main'

.obsidian/core-plugins.json

@@ -21,7 +21,7 @@
   "random-note": false,
   "outline": true,
   "word-count": true,
-  "slides": false,
+  "slides": true,
   "audio-recorder": false,
   "workspaces": false,
   "file-recovery": true,

.obsidian/plugins/obsidian-git/data.json

@@ -16,8 +16,8 @@
   "listChangedFilesInMessageBody": false,
   "showStatusBar": true,
   "updateSubmodules": false,
-  "syncMethod": "merge",
-  "mergeStrategy": "none",
+  "syncMethod": "rebase",
+  "mergeStrategy": "ours",
   "customMessageOnAutoBackup": false,
   "autoBackupAfterFileChange": false,
   "treeStructure": false,