vault backup: 2025-07-08 21:17:29

Affected files:
.obsidian/community-plugins.sync-conflict-20250708-202514-5FF53Z3.json
Workspace/SpringTraveler.com/viator calendar - Google Gemini.sync-conflict-20250708-202617-5FF53Z3.mhtml

.obsidian/community-plugins.sync-conflict-20250708-202514-5FF53Z3.json

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 [
   "obsidian-style-settings",
   "obsidian-quiet-outline",
@@ -19,4 +20,27 @@
   "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
 ]