<<<<<<< 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 ]