Merge remote-tracking branch 'git/main'

1 year ago · fd59522b2d
parent 607b1226dd 74f2e1b877
commit fd59522b2d
1 changed files with 2 additions and 2 deletions
--- a/.obsidian/plugins/obsidian-git/data.json
+++ b/.obsidian/plugins/obsidian-git/data.json
@ -7,13 +7,13 @@
  "autoPullOnBoot": true,
  "disablePush": false,
  "pullBeforePush": true,
-  "disablePopups": true,
+  "disablePopups": false,
  "listChangedFilesInMessageBody": true,
  "showStatusBar": true,
  "updateSubmodules": false,
  "syncMethod": "merge",
  "customMessageOnAutoBackup": false,
-  "autoBackupAfterFileChange": false,
+  "autoBackupAfterFileChange": true,
  "treeStructure": false,
  "refreshSourceControl": true,
  "basePath": "",