vault backup: 2025-07-09 09:32:30
Affected files: .obsidian/community-plugins.sync-conflict-20250708-202514-5FF53Z3.json Haina/Weekly/2025/2025-W29.md Workspace/SpringTraveler.com/viator calendar - Google Gemini.mhtml Workspace/SpringTraveler.com/viator calendar - Google Gemini.sync-conflict-20250708-202617-5FF53Z3.mhtmlmain
parent
07736890ee
commit
e00f4d72c3
@ -1,46 +0,0 @@
|
|||||||
<<<<<<< HEAD
|
|
||||||
[
|
|
||||||
"obsidian-style-settings",
|
|
||||||
"obsidian-quiet-outline",
|
|
||||||
"obsidian-enhancing-mindmap",
|
|
||||||
"obsidian-auto-link-title",
|
|
||||||
"cm-editor-syntax-highlight-obsidian",
|
|
||||||
"emoji-shortcodes",
|
|
||||||
"obsidian-emoji-toolbar",
|
|
||||||
"obsidian-enhancing-export",
|
|
||||||
"obsidian-git",
|
|
||||||
"obsidian-pandoc",
|
|
||||||
"dataview",
|
|
||||||
"templater-obsidian",
|
|
||||||
"calendar",
|
|
||||||
"obsidian-tasks-plugin",
|
|
||||||
"periodic-notes",
|
|
||||||
"obsidian-excalidraw-plugin",
|
|
||||||
"text-snippets-obsidian",
|
|
||||||
"obsidian-list-callouts",
|
|
||||||
"obsidian-columns",
|
|
||||||
"obsidian-linter"
|
|
||||||
=======
|
|
||||||
[
|
|
||||||
"obsidian-style-settings",
|
|
||||||
"obsidian-quiet-outline",
|
|
||||||
"obsidian-enhancing-mindmap",
|
|
||||||
"obsidian-auto-link-title",
|
|
||||||
"cm-editor-syntax-highlight-obsidian",
|
|
||||||
"emoji-shortcodes",
|
|
||||||
"obsidian-emoji-toolbar",
|
|
||||||
"obsidian-enhancing-export",
|
|
||||||
"obsidian-git",
|
|
||||||
"obsidian-pandoc",
|
|
||||||
"dataview",
|
|
||||||
"templater-obsidian",
|
|
||||||
"calendar",
|
|
||||||
"obsidian-tasks-plugin",
|
|
||||||
"periodic-notes",
|
|
||||||
"obsidian-excalidraw-plugin",
|
|
||||||
"text-snippets-obsidian",
|
|
||||||
"obsidian-list-callouts",
|
|
||||||
"obsidian-columns",
|
|
||||||
"obsidian-linter"
|
|
||||||
>>>>>>> git/main
|
|
||||||
]
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue