From 9208f7464c1dbac631ae0b4ebdf217e09ae48d54 Mon Sep 17 00:00:00 2001 From: Lei OT Date: Wed, 30 Jul 2025 14:18:04 +0800 Subject: [PATCH] vault backup: 2025-07-30 14:18:04 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Affected files: .obsidian/plugins/obsidian-git/data.sync-conflict-20250728-023242-5FF53Z3.json .obsidian/plugins/obsidian-git/data.sync-conflict-20250728-222314-CALEDER.json .obsidian/plugins/obsidian-git/data.sync-conflict-20250728-223150-5FF53Z3.json .obsidian/snippets/color.sync-conflict-20250727-161959-5FF53Z3.css Haina/Weekly/2025/2025-W32.md Workspace/SpringTraveler.com/viator预订流程2019.sync-conflict-20250727-161959-5FF53Z3.txt --- ...sync-conflict-20250728-023242-5FF53Z3.json | 55 ------------------- ...sync-conflict-20250728-222314-CALEDER.json | 55 ------------------- ...sync-conflict-20250728-223150-5FF53Z3.json | 55 ------------------- ....sync-conflict-20250727-161959-5FF53Z3.css | 16 ------ Haina/Weekly/2025/2025-W32.md | 4 +- ....sync-conflict-20250727-161959-5FF53Z3.txt | 25 --------- 6 files changed, 2 insertions(+), 208 deletions(-) delete mode 100644 .obsidian/plugins/obsidian-git/data.sync-conflict-20250728-023242-5FF53Z3.json delete mode 100644 .obsidian/plugins/obsidian-git/data.sync-conflict-20250728-222314-CALEDER.json delete mode 100644 .obsidian/plugins/obsidian-git/data.sync-conflict-20250728-223150-5FF53Z3.json delete mode 100644 .obsidian/snippets/color.sync-conflict-20250727-161959-5FF53Z3.css delete mode 100644 Workspace/SpringTraveler.com/viator预订流程2019.sync-conflict-20250727-161959-5FF53Z3.txt diff --git a/.obsidian/plugins/obsidian-git/data.sync-conflict-20250728-023242-5FF53Z3.json b/.obsidian/plugins/obsidian-git/data.sync-conflict-20250728-023242-5FF53Z3.json deleted file mode 100644 index a8eae5e..0000000 --- a/.obsidian/plugins/obsidian-git/data.sync-conflict-20250728-023242-5FF53Z3.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "commitMessage": "vault backup: {{date}}", - "commitDateFormat": "YYYY-MM-DD HH:mm:ss", - "autoSaveInterval": 60, - "autoPushInterval": 0, - "autoPullInterval": 180, - "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 diff --git a/.obsidian/plugins/obsidian-git/data.sync-conflict-20250728-222314-CALEDER.json b/.obsidian/plugins/obsidian-git/data.sync-conflict-20250728-222314-CALEDER.json deleted file mode 100644 index 5d297e2..0000000 --- a/.obsidian/plugins/obsidian-git/data.sync-conflict-20250728-222314-CALEDER.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "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 diff --git a/.obsidian/plugins/obsidian-git/data.sync-conflict-20250728-223150-5FF53Z3.json b/.obsidian/plugins/obsidian-git/data.sync-conflict-20250728-223150-5FF53Z3.json deleted file mode 100644 index bf8827b..0000000 --- a/.obsidian/plugins/obsidian-git/data.sync-conflict-20250728-223150-5FF53Z3.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "commitMessage": "vault backup: {{date}}", - "commitDateFormat": "YYYY-MM-DD HH:mm:ss", - "autoSaveInterval": 60, - "autoPushInterval": 0, - "autoPullInterval": 180, - "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 diff --git a/.obsidian/snippets/color.sync-conflict-20250727-161959-5FF53Z3.css b/.obsidian/snippets/color.sync-conflict-20250727-161959-5FF53Z3.css deleted file mode 100644 index 6e2c454..0000000 --- a/.obsidian/snippets/color.sync-conflict-20250727-161959-5FF53Z3.css +++ /dev/null @@ -1,16 +0,0 @@ -<<<<<<< HEAD -.blue .cm-line.HyperMD-codeblock{ - background-color: #daedfc; -} - -.red .cm-line.HyperMD-codeblock { - background-color: #ffe2df; -} - -.green .cm-line.HyperMD-codeblock { - background-color: #e0fff4; -} - -.yellow .cm-line.HyperMD-codeblock { - background-color: #fffede; -} diff --git a/Haina/Weekly/2025/2025-W32.md b/Haina/Weekly/2025/2025-W32.md index 0cf41bf..d73b219 100644 --- a/Haina/Weekly/2025/2025-W32.md +++ b/Haina/Weekly/2025/2025-W32.md @@ -1,6 +1,6 @@ --- Created: 2023-09-15 17:08 Fri -Updated: 2025-07-30 13:35 Wed +Updated: 2025-07-30 13:52 Wed tags: - 周报 --- @@ -21,7 +21,7 @@ tags: #### 销售平台 -1. [ ] 邮件: 回复全部 ➕ 2025-07-30 +1. [x] 邮件: 回复全部 ➕ 2025-07-30 ✅ 2025-07-30 ## 本周计划 diff --git a/Workspace/SpringTraveler.com/viator预订流程2019.sync-conflict-20250727-161959-5FF53Z3.txt b/Workspace/SpringTraveler.com/viator预订流程2019.sync-conflict-20250727-161959-5FF53Z3.txt deleted file mode 100644 index 253fa68..0000000 --- a/Workspace/SpringTraveler.com/viator预订流程2019.sync-conflict-20250727-161959-5FF53Z3.txt +++ /dev/null @@ -1,25 +0,0 @@ - -ViatorڲƷҳ治ʾƷĹӦ, - -ԤҪʱ, ɹһ. - -ʹƳ`reserve now & Pay later`ҲҪԤÿϢ, ҿۿ1Ϊ֤ʵĿ - - - -Ԥ: - -һ. Ԥɹ, յViatorĵһȷʼ. - -viator, Ʒϸ, ڵ, - -providerƺԤĿͷֻ, Email - -. Ӧں̨ԸԤĿ, ָ, ϵʽ, viatorļʱϢϵͳ -ĿǰTrippestа, ֱϵ. - -. е, viatorӪʼ, - -ԭĿĵصܱ߲Ʒ, Ŀǰյ,ǰƼͬӦ̵IJƷ - -. г̽ڶ, յ۵ʼ, һֱһ, ܹյ4ʼ. \ No newline at end of file