From a871e299dff8c4b6c2248f8514a98b1e5a14697e Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Sat, 7 Dec 2024 12:50:53 +0800
Subject: [PATCH] vault backup: 2024-12-07 12:50:53

Affected files:
.obsidian/plugins/obsidian-git/data.sync-conflict-20241207-125051-5FF53Z3.json
---
 ...sync-conflict-20241207-125051-5FF53Z3.json | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 .obsidian/plugins/obsidian-git/data.sync-conflict-20241207-125051-5FF53Z3.json

diff --git a/.obsidian/plugins/obsidian-git/data.sync-conflict-20241207-125051-5FF53Z3.json b/.obsidian/plugins/obsidian-git/data.sync-conflict-20241207-125051-5FF53Z3.json
new file mode 100644
index 0000000..5d297e2
--- /dev/null
+++ b/.obsidian/plugins/obsidian-git/data.sync-conflict-20241207-125051-5FF53Z3.json
@@ -0,0 +1,55 @@
+{
+  "commitMessage": "vault backup: {{date}}",
+  "commitDateFormat": "YYYY-MM-DD HH:mm:ss",
+  "autoSaveInterval": 30,
+  "autoPushInterval": 0,
+  "autoPullInterval": 30,
+  "autoPullOnBoot": true,
+  "disablePush": false,
+  "pullBeforePush": true,
+  "disablePopups": true,
+  "listChangedFilesInMessageBody": true,
+  "showStatusBar": true,
+  "updateSubmodules": false,
+  "syncMethod": "merge",
+  "customMessageOnAutoBackup": false,
+  "autoBackupAfterFileChange": false,
+  "treeStructure": false,
+  "refreshSourceControl": true,
+  "basePath": "",
+  "differentIntervalCommitAndPush": false,
+  "changedFilesInStatusBar": true,
+  "showedMobileNotice": true,
+  "refreshSourceControlTimer": 7000,
+  "showBranchStatusBar": true,
+  "setLastSaveToLastCommit": false,
+  "submoduleRecurseCheckout": false,
+  "gitDir": "",
+  "showFileMenu": true,
+  "lineAuthor": {
+    "show": false,
+    "followMovement": "inactive",
+    "authorDisplay": "initials",
+    "showCommitHash": false,
+    "dateTimeFormatOptions": "date",
+    "dateTimeFormatCustomString": "YYYY-MM-DD HH:mm",
+    "dateTimeTimezone": "viewer-local",
+    "coloringMaxAge": "1y",
+    "colorNew": {
+      "r": 255,
+      "g": 150,
+      "b": 150
+    },
+    "colorOld": {
+      "r": 120,
+      "g": 160,
+      "b": 255
+    },
+    "textColorCss": "var(--text-muted)",
+    "ignoreWhitespace": false,
+    "gutterSpacingFallbackLength": 5,
+    "lastShownAuthorDisplay": "initials",
+    "lastShownDateTimeFormatOptions": "date"
+  },
+  "autoCommitMessage": "vault backup: {{date}}"
+}
\ No newline at end of file